3 files changed, 55 insertions, 0 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 9819d0d048db..8010254e9cf9 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -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[] = {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 39be79619068..2374a5c495f2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -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
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 74b1dc8a7cdd..5ecf96660644 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -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;
+}