Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87698c8a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/vmwgfx: Stop checking for DRM_UNLOCKED 



drm core enforces now for DRIVER_MODESET that all ioctls are unlocked.
And all the old nasty ones from drm core aren't allowed for modern
drivers any more. Hence this is no longer needed.

Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 0aaf20cf

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+0 −8
Original line number Diff line number Diff line
@@ -1061,14 +1061,6 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev, 
	}

	mutex_unlock(&dev->master_mutex);



	/*

	 * Taking the drm_global_mutex after the TTM lock might deadlock

	 */

	if (!(flags & DRM_UNLOCKED)) {

		DRM_ERROR("Refusing locked ioctl access.\n");

		return ERR_PTR(-EDEADLK);

	}



	/*

	 * Take the TTM lock. Possibly sleep waiting for the authenticating

	 * master to become master again, or for a SIGTERM if the