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

Commit c4249855 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/vmwgfx: Don't kill clients on VT switch 



DRI clients that tried to grab the TTM lock when the master (X server) was
switched away during a VT switch were sent the SIGTERM signal by the
kernel. Fix this so that they are only sent that signal when the master has
exited.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 26682480

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+12 −5
Original line number Diff line number Diff line
@@ -740,9 +740,17 @@ static void vmw_postclose(struct drm_device *dev, 
	struct vmw_fpriv *vmw_fp;



	vmw_fp = vmw_fpriv(file_priv);

	ttm_object_file_release(&vmw_fp->tfile);

	if (vmw_fp->locked_master)



	if (vmw_fp->locked_master) {

		struct vmw_master *vmaster =

			vmw_master(vmw_fp->locked_master);



		ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);

		ttm_vt_unlock(&vmaster->lock);

		drm_master_put(&vmw_fp->locked_master);

	}



	ttm_object_file_release(&vmw_fp->tfile);

	kfree(vmw_fp);

}
@@ -925,14 +933,13 @@ static void vmw_master_drop(struct drm_device *dev, 


	vmw_fp->locked_master = drm_master_get(file_priv->master);

	ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile);

	vmw_execbuf_release_pinned_bo(dev_priv);



	if (unlikely((ret != 0))) {

		DRM_ERROR("Unable to lock TTM at VT switch.\n");

		drm_master_put(&vmw_fp->locked_master);

	}



	ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);

	ttm_lock_set_kill(&vmaster->lock, false, SIGTERM);

	vmw_execbuf_release_pinned_bo(dev_priv);



	if (!dev_priv->enable_fb) {

		ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);