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

Commit 830f4dad authored by Emil Velikov's avatar Emil Velikov Committed by Alistair Delva
Browse files

UPSTREAM: drm/virtio: remove irrelevant DRM_UNLOCKED flag 



DRM_UNLOCKED doesn't do anything for non-legacy drivers. Remove it.

Cc: David Airlie <airlied@linux.ie>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190522154702.16269-2-emil.l.velikov@gmail.com


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit cbb56814fbe7fedd71cd6b29dc83bab2915a5b74)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: I2a99803f684ed6a87b6ffa503502974c2d569f9d
parent f586e0dc

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+9 −9
Original line number Diff line number Diff line
@@ -556,34 +556,34 @@ static int virtio_gpu_get_caps_ioctl(struct drm_device *dev, 


struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS] = {

	DRM_IOCTL_DEF_DRV(VIRTGPU_MAP, virtio_gpu_map_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_EXECBUFFER, virtio_gpu_execbuffer_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_GETPARAM, virtio_gpu_getparam_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_CREATE,

			  virtio_gpu_resource_create_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_RESOURCE_INFO, virtio_gpu_resource_info_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	/* make transfer async to the main ring? - no sure, can we

	 * thread these in the underlying GL

	 */

	DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_FROM_HOST,

			  virtio_gpu_transfer_from_host_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(VIRTGPU_TRANSFER_TO_HOST,

			  virtio_gpu_transfer_to_host_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_WAIT, virtio_gpu_wait_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),



	DRM_IOCTL_DEF_DRV(VIRTGPU_GET_CAPS, virtio_gpu_get_caps_ioctl,

			  DRM_AUTH | DRM_UNLOCKED | DRM_RENDER_ALLOW),

			  DRM_AUTH | DRM_RENDER_ALLOW),

};