Commit 058ca50c authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/legacy: move lock cleanup for master into lock file (v2) 



This makes it easier to remove legacy code later.

v2: move check into lock file as well.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9b7a7743

drivers/gpu/drm/drm_auth.c

+1 −15
Original line number Diff line number Diff line
@@ -274,21 +274,7 @@ void drm_master_release(struct drm_file *file_priv) 
	if (!drm_is_current_master(file_priv))

		goto out;



	if (drm_core_check_feature(dev, DRIVER_LEGACY)) {

		/*

		 * Since the master is disappearing, so is the

		 * possibility to lock.

		 */

		mutex_lock(&dev->struct_mutex);

		if (master->lock.hw_lock) {

			if (dev->sigdata.lock == master->lock.hw_lock)

				dev->sigdata.lock = NULL;

			master->lock.hw_lock = NULL;

			master->lock.file_priv = NULL;

			wake_up_interruptible_all(&master->lock.lock_queue);

		}

		mutex_unlock(&dev->struct_mutex);

	}

	drm_legacy_lock_master_cleanup(dev, master);



	if (dev->master == file_priv->master)

		drm_drop_master(dev, file_priv);

drivers/gpu/drm/drm_legacy.h

+1 −0
Original line number Diff line number Diff line
@@ -126,4 +126,5 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, 
int drm_legacy_sg_free(struct drm_device *dev, void *data,

		       struct drm_file *file_priv);



void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master);

#endif /* __DRM_LEGACY_H__ */

drivers/gpu/drm/drm_lock.c

+19 −0
Original line number Diff line number Diff line
@@ -347,3 +347,22 @@ void drm_legacy_lock_release(struct drm_device *dev, struct file *filp) 
				     _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));

	}

}



void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master)

{

	if (!drm_core_check_feature(dev, DRIVER_LEGACY))

		return;



	/*

	 * Since the master is disappearing, so is the

	 * possibility to lock.

	 */	mutex_lock(&dev->struct_mutex);

	if (master->lock.hw_lock) {

		if (dev->sigdata.lock == master->lock.hw_lock)

			dev->sigdata.lock = NULL;

		master->lock.hw_lock = NULL;

		master->lock.file_priv = NULL;

		wake_up_interruptible_all(&master->lock.lock_queue);

	}

	mutex_unlock(&dev->struct_mutex);

}