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

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

vmwgfx: Add functionality to get 3D caps 



Since we don't allow user-space to map the fifo anymore,
add a parameter to get fifo hw version and
an ioctl to copy the 3D capabilities.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecranz <jakob@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 07999a7e

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ 
#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_GET_3D_CAP				\

	DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_GET_3D_CAP,		\

		struct drm_vmw_get_3d_cap_arg)



/**

 * The core DRM version of this macro doesn't account for
@@ -130,6 +133,8 @@ 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_GET_3D_CAP, vmw_get_cap_3d_ioctl,

		      DRM_AUTH | DRM_UNLOCKED),

};



static struct pci_device_id vmw_pci_id_list[] = {

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ extern int vmw_user_stream_lookup(struct vmw_private *dev_priv, 


extern int vmw_getparam_ioctl(struct drm_device *dev, void *data,

			      struct drm_file *file_priv);

extern int vmw_get_cap_3d_ioctl(struct drm_device *dev, void *data,

				struct drm_file *file_priv);



/**

 * Fifo utilities - vmwgfx_fifo.c

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

+48 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 
	case DRM_VMW_PARAM_MAX_FB_SIZE:

		param->value = dev_priv->vram_size;

		break;

	case DRM_VMW_PARAM_FIFO_HW_VERSION:

	{

		__le32 __iomem *fifo_mem = dev_priv->mmio_virt;



		param->value = ioread32(fifo_mem + SVGA_FIFO_3D_HWVERSION);

		break;

	}

	default:

		DRM_ERROR("Illegal vmwgfx get param request: %d\n",

			  param->param);
@@ -62,3 +69,44 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 


	return 0;

}





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

			 struct drm_file *file_priv)

{

	struct drm_vmw_get_3d_cap_arg *arg =

		(struct drm_vmw_get_3d_cap_arg *) data;

	struct vmw_private *dev_priv = vmw_priv(dev);

	uint32_t size;

	__le32 __iomem *fifo_mem;

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

	void *bounce;

	int ret;



	if (unlikely(arg->pad64 != 0)) {

		DRM_ERROR("Illegal GET_3D_CAP argument.\n");

		return -EINVAL;

	}



	size = (SVGA_FIFO_3D_CAPS_LAST - SVGA_FIFO_3D_CAPS + 1) << 2;



	if (arg->max_size < size)

		size = arg->max_size;



	bounce = vmalloc(size);

	if (unlikely(bounce == NULL)) {

		DRM_ERROR("Failed to allocate bounce buffer for 3D caps.\n");

		return -ENOMEM;

	}



	fifo_mem = dev_priv->mmio_virt;

	memcpy_fromio(bounce, &fifo_mem[SVGA_FIFO_3D_CAPS], size);



	ret = copy_to_user(buffer, bounce, size);

	vfree(bounce);



	if (unlikely(ret != 0))

		DRM_ERROR("Failed to report 3D caps info.\n");



	return ret;

}

include/drm/vmwgfx_drm.h

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

#define DRM_VMW_EXECBUF              12

#define DRM_VMW_FENCE_WAIT           13

#define DRM_VMW_GET_3D_CAP           14



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

/**
@@ -68,6 +69,7 @@ 
#define DRM_VMW_PARAM_HW_CAPS          3

#define DRM_VMW_PARAM_FIFO_CAPS        4

#define DRM_VMW_PARAM_MAX_FB_SIZE      5

#define DRM_VMW_PARAM_FIFO_HW_VERSION  6



/**

 * struct drm_vmw_getparam_arg
@@ -557,6 +559,29 @@ struct drm_vmw_stream_arg { 
 * Return a single stream that was claimed by this process. Also makes

 * sure that the stream has been stopped.

 */

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

/**

 * DRM_VMW_GET_3D_CAP

 *

 * Read 3D capabilities from the FIFO

 *

 */



/**

 * struct drm_vmw_get_3d_cap_arg

 *

 * @buffer: Pointer to a buffer for capability data, cast to an uint64_t

 * @size: Max size to copy

 *

 * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL

 * ioctls.

 */



struct drm_vmw_get_3d_cap_arg {

	uint64_t buffer;

	uint32_t max_size;

	uint32_t pad64;

};



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

/**