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

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

vmwgfx: Remove the update layout IOCTL. 



It doesn't seem like its needed. If this turns out to be an incorrect
assumption, we can reinstate it.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 781b8bdb

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ 
#define DRM_IOCTL_VMW_FENCE_WAIT				\

	DRM_IOWR(DRM_COMMAND_BASE + DRM_VMW_FENCE_WAIT,		\

		 struct drm_vmw_fence_wait_arg)

#define DRM_IOCTL_VMW_UPDATE_LAYOUT				\

	DRM_IOWR(DRM_COMMAND_BASE + DRM_VMW_UPDATE_LAYOUT,	\

		 struct drm_vmw_update_layout_arg)





/**

 * The core DRM version of this macro doesn't account for
@@ -134,8 +130,6 @@ static struct drm_ioctl_desc vmw_ioctls[] = { 
		      DRM_AUTH | DRM_UNLOCKED),

	VMW_IOCTL_DEF(VMW_FENCE_WAIT, vmw_fence_wait_ioctl,

		      DRM_AUTH | DRM_UNLOCKED),

	VMW_IOCTL_DEF(VMW_UPDATE_LAYOUT, vmw_kms_update_layout_ioctl,

		      DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED)

};



static struct pci_device_id vmw_pci_id_list[] = {

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -508,8 +508,6 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, 
int vmw_kms_write_svga(struct vmw_private *vmw_priv,

		       unsigned width, unsigned height, unsigned pitch,

		       unsigned bpp, unsigned depth);

int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,

				struct drm_file *file_priv);

void vmw_kms_idle_workqueues(struct vmw_master *vmaster);

bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv,

				uint32_t pitch,

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+0 −46
Original line number Diff line number Diff line
@@ -1092,52 +1092,6 @@ int vmw_kms_restore_vga(struct vmw_private *vmw_priv) 
	return 0;

}



int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,

				struct drm_file *file_priv)

{

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct drm_vmw_update_layout_arg *arg =

		(struct drm_vmw_update_layout_arg *)data;

	struct vmw_master *vmaster = vmw_master(file_priv->master);

	void __user *user_rects;

	struct drm_vmw_rect *rects;

	unsigned rects_size;

	int ret;



	ret = ttm_read_lock(&vmaster->lock, true);

	if (unlikely(ret != 0))

		return ret;



	if (!arg->num_outputs) {

		struct drm_vmw_rect def_rect = {0, 0, 800, 600};

		vmw_kms_ldu_update_layout(dev_priv, 1, &def_rect);

		goto out_unlock;

	}



	rects_size = arg->num_outputs * sizeof(struct drm_vmw_rect);

	rects = kzalloc(rects_size, GFP_KERNEL);

	if (unlikely(!rects)) {

		ret = -ENOMEM;

		goto out_unlock;

	}



	user_rects = (void __user *)(unsigned long)arg->rects;

	ret = copy_from_user(rects, user_rects, rects_size);

	if (unlikely(ret != 0)) {

		DRM_ERROR("Failed to get rects.\n");

		ret = -EFAULT;

		goto out_free;

	}



	vmw_kms_ldu_update_layout(dev_priv, arg->num_outputs, rects);



out_free:

	kfree(rects);

out_unlock:

	ttm_read_unlock(&vmaster->lock);

	return ret;

}



bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv,

				uint32_t pitch,

				uint32_t height)

include/drm/vmwgfx_drm.h

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 
#define DRM_VMW_REF_SURFACE          11

#define DRM_VMW_EXECBUF              12

#define DRM_VMW_FENCE_WAIT           13

/* guarded by minor version >= 2 */

#define DRM_VMW_UPDATE_LAYOUT        14





/*************************************************************************/

/**