diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-11-21 06:34:47 -0500 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-01-17 01:52:34 -0500 |
| commit | 311474dbdc6ab0ad366fbec040dbe669edd30a35 (patch) | |
| tree | e41a0324ac99c74bd01c18a00c94f6793f6cc3b0 | |
| parent | 1d7a5cbf8f74edee0b1d9ee479367b5d876bf627 (diff) | |
drm/vmwgfx: Add a parameter to get max MOB memory size
Also bump minor to signal a GB-aware kernel module
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 3 | ||||
| -rw-r--r-- | include/uapi/drm/vmwgfx_drm.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index fe3c2e3e1cbe..76751e953834 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <drm/ttm/ttm_module.h> | 40 | #include <drm/ttm/ttm_module.h> |
| 41 | #include "vmwgfx_fence.h" | 41 | #include "vmwgfx_fence.h" |
| 42 | 42 | ||
| 43 | #define VMWGFX_DRIVER_DATE "20120209" | 43 | #define VMWGFX_DRIVER_DATE "20121114" |
| 44 | #define VMWGFX_DRIVER_MAJOR 2 | 44 | #define VMWGFX_DRIVER_MAJOR 2 |
| 45 | #define VMWGFX_DRIVER_MINOR 4 | 45 | #define VMWGFX_DRIVER_MINOR 5 |
| 46 | #define VMWGFX_DRIVER_PATCHLEVEL 0 | 46 | #define VMWGFX_DRIVER_PATCHLEVEL 0 |
| 47 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 | 47 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 |
| 48 | #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) | 48 | #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index 641908e06eab..116c49736763 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | |||
| @@ -79,6 +79,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, | |||
| 79 | SVGA_FIFO_3D_CAPS + 1); | 79 | SVGA_FIFO_3D_CAPS + 1); |
| 80 | param->value *= sizeof(uint32_t); | 80 | param->value *= sizeof(uint32_t); |
| 81 | break; | 81 | break; |
| 82 | case DRM_VMW_PARAM_MAX_MOB_MEMORY: | ||
| 83 | param->value = dev_priv->max_mob_pages * PAGE_SIZE; | ||
| 84 | break; | ||
| 82 | default: | 85 | default: |
| 83 | DRM_ERROR("Illegal vmwgfx get param request: %d\n", | 86 | DRM_ERROR("Illegal vmwgfx get param request: %d\n", |
| 84 | param->param); | 87 | param->param); |
diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h index adb7e0d0d3b6..9971c560ed9a 100644 --- a/include/uapi/drm/vmwgfx_drm.h +++ b/include/uapi/drm/vmwgfx_drm.h | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #define DRM_VMW_PARAM_FIFO_HW_VERSION 6 | 86 | #define DRM_VMW_PARAM_FIFO_HW_VERSION 6 |
| 87 | #define DRM_VMW_PARAM_MAX_SURF_MEMORY 7 | 87 | #define DRM_VMW_PARAM_MAX_SURF_MEMORY 7 |
| 88 | #define DRM_VMW_PARAM_3D_CAPS_SIZE 8 | 88 | #define DRM_VMW_PARAM_3D_CAPS_SIZE 8 |
| 89 | #define DRM_VMW_PARAM_MAX_MOB_MEMORY 9 | ||
| 89 | 90 | ||
| 90 | /** | 91 | /** |
| 91 | * struct drm_vmw_getparam_arg | 92 | * struct drm_vmw_getparam_arg |
