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

Commit 41e8a0a3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'vmwgfx-next-15-09-01' of git://people.freedesktop.org/~thomash/linux into drm-next 

Pull request of 2015-09-01

A single commit. Workaround for
https://bugzilla.redhat.com/show_bug.cgi?id=1227193

* tag 'vmwgfx-next-15-09-01' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Allow dropped masters render-node like access on legacy nodes v2
parents 55cdb314 aa3469ce

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -1052,10 +1052,15 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev, 
	}



	/*

	 * Check if we were previously master, but now dropped.

	 * Check if we were previously master, but now dropped. In that

	 * case, allow at least render node functionality.

	 */

	if (vmw_fp->locked_master) {

		mutex_unlock(&dev->master_mutex);



		if (flags & DRM_RENDER_ALLOW)

			return NULL;



		DRM_ERROR("Dropped master trying to access ioctl that "

			  "requires authentication.\n");

		return ERR_PTR(-EACCES);

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

+6 −0
Original line number Diff line number Diff line
@@ -911,6 +911,12 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, 
				  "surface reference.\n");

			return -EACCES;

		}

		if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) {

			DRM_ERROR("Locked master refused legacy "

				  "surface reference.\n");

			return -EACCES;

		}



		handle = u_handle;

	}