From 1e137eeb7cc3ef871f0a8589292464091b637cd0 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 26 Oct 2011 00:31:26 +0200 Subject: [PATCH] --- yaml --- r: 318729 b: refs/heads/master c: 67cb4b4dd4b3bb38626a841200638a4e953ea3fd h: refs/heads/master i: 318727: 3e27f19e98ec66966f4c1a54147521a5cc64208a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_fops.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4e1ee6c745c6..f6dd76621bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a344a7e7c27776950a70ce4b829a9ac15a212e65 +refs/heads/master: 67cb4b4dd4b3bb38626a841200638a4e953ea3fd diff --git a/trunk/drivers/gpu/drm/drm_fops.c b/trunk/drivers/gpu/drm/drm_fops.c index c6f5f8951482..d25a61739a7b 100644 --- a/trunk/drivers/gpu/drm/drm_fops.c +++ b/trunk/drivers/gpu/drm/drm_fops.c @@ -376,9 +376,6 @@ static void drm_master_release(struct drm_device *dev, struct file *filp) drm_lock_free(&file_priv->master->lock, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); } - - if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) - drm_core_reclaim_buffers(dev, file_priv); } static void drm_events_release(struct drm_file *file_priv) @@ -448,6 +445,9 @@ int drm_release(struct inode *inode, struct file *filp) if (file_priv->minor->master) drm_master_release(dev, filp); + if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) + drm_core_reclaim_buffers(dev, file_priv); + drm_events_release(file_priv); if (dev->driver->driver_features & DRIVER_MODESET)