drm/vmwgfx: Work around drm removal of control nodes (5565d5e5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -199,9 +199,14 @@ static const struct drm_ioctl_desc vmw_ioctls[] = {
		VMW_IOCTL_DEF(VMW_PRESENT_READBACK,
		vmw_present_readback_ioctl,
		DRM_MASTER \| DRM_AUTH),
		/*
		* The permissions of the below ioctl are overridden in
		* vmw_generic_ioctl(). We require either
		* DRM_MASTER or capable(CAP_SYS_ADMIN).
		*/
		VMW_IOCTL_DEF(VMW_UPDATE_LAYOUT,
		vmw_kms_update_layout_ioctl,
		DRM_MASTER \| DRM_CONTROL_ALLOW),
		DRM_RENDER_ALLOW),
		VMW_IOCTL_DEF(VMW_CREATE_SHADER,
		vmw_shader_define_ioctl,
		DRM_AUTH \| DRM_RENDER_ALLOW),
		@@ -1125,6 +1130,10 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,

		return (long) vmw_execbuf_ioctl(dev, arg, file_priv,
		_IOC_SIZE(cmd));
		} else if (nr == DRM_COMMAND_BASE + DRM_VMW_UPDATE_LAYOUT) {
		if (!drm_is_current_master(file_priv) &&
		!capable(CAP_SYS_ADMIN))
		return -EACCES;
		}

		if (unlikely(ioctl->cmd != cmd))

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,9 +41,9 @@
		#include <drm/ttm/ttm_module.h>
		#include "vmwgfx_fence.h"

		#define VMWGFX_DRIVER_DATE "20160210"
		#define VMWGFX_DRIVER_DATE "20170221"
		#define VMWGFX_DRIVER_MAJOR 2
		#define VMWGFX_DRIVER_MINOR 11
		#define VMWGFX_DRIVER_MINOR 12
		#define VMWGFX_DRIVER_PATCHLEVEL 0
		#define VMWGFX_FILE_PAGE_OFFSET 0x00100000
		#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)