Commit 0de4cc99 authored by Daniel Vetter's avatar Daniel Vetter

drm: Only do the hw.lock cleanup in master_relase for !MODESET

Another place gone where modern drivers could have hit
dev->struct_mutex.

To avoid too deeply nesting control flow rework it a bit.

v2: Review from Chris:
- remove spurious newline.
- fix file_priv->master like for the !file_priv->is_master case.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-2-git-send-email-daniel.vetter@ffwll.ch
parent e4245ea8
...@@ -246,11 +246,13 @@ int drm_master_open(struct drm_file *file_priv) ...@@ -246,11 +246,13 @@ int drm_master_open(struct drm_file *file_priv)
void drm_master_release(struct drm_file *file_priv) void drm_master_release(struct drm_file *file_priv)
{ {
struct drm_device *dev = file_priv->minor->dev; struct drm_device *dev = file_priv->minor->dev;
struct drm_master *master = file_priv->master;
mutex_lock(&dev->master_mutex); mutex_lock(&dev->master_mutex);
if (file_priv->is_master) { if (!file_priv->is_master)
struct drm_master *master = file_priv->master; goto out;
if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
/* /*
* Since the master is disappearing, so is the * Since the master is disappearing, so is the
* possibility to lock. * possibility to lock.
...@@ -264,15 +266,15 @@ void drm_master_release(struct drm_file *file_priv) ...@@ -264,15 +266,15 @@ void drm_master_release(struct drm_file *file_priv)
wake_up_interruptible_all(&master->lock.lock_queue); wake_up_interruptible_all(&master->lock.lock_queue);
} }
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
if (file_priv->minor->master == file_priv->master) {
/* drop the reference held my the minor */
if (dev->driver->master_drop)
dev->driver->master_drop(dev, file_priv, true);
drm_master_put(&file_priv->minor->master);
}
} }
if (file_priv->minor->master == file_priv->master) {
/* drop the reference held my the minor */
if (dev->driver->master_drop)
dev->driver->master_drop(dev, file_priv, true);
drm_master_put(&file_priv->minor->master);
}
out:
/* drop the master reference held by the file priv */ /* drop the master reference held by the file priv */
if (file_priv->master) if (file_priv->master)
drm_master_put(&file_priv->master); drm_master_put(&file_priv->master);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment