diff options
| -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/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 a10d0ad3103..217ba1fe5dd 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
| @@ -39,9 +39,9 @@ | |||
| 39 | #include "ttm/ttm_execbuf_util.h" | 39 | #include "ttm/ttm_execbuf_util.h" |
| 40 | #include "ttm/ttm_module.h" | 40 | #include "ttm/ttm_module.h" |
| 41 | 41 | ||
| 42 | #define VMWGFX_DRIVER_DATE "20100209" | 42 | #define VMWGFX_DRIVER_DATE "20100723" |
| 43 | #define VMWGFX_DRIVER_MAJOR 1 | 43 | #define VMWGFX_DRIVER_MAJOR 1 |
| 44 | #define VMWGFX_DRIVER_MINOR 2 | 44 | #define VMWGFX_DRIVER_MINOR 3 |
| 45 | #define VMWGFX_DRIVER_PATCHLEVEL 0 | 45 | #define VMWGFX_DRIVER_PATCHLEVEL 0 |
| 46 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 | 46 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 |
| 47 | #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) | 47 | #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 1c7a316454d..570d57775a5 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | |||
| @@ -54,6 +54,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, | |||
| 54 | case DRM_VMW_PARAM_FIFO_CAPS: | 54 | case DRM_VMW_PARAM_FIFO_CAPS: |
| 55 | param->value = dev_priv->fifo.capabilities; | 55 | param->value = dev_priv->fifo.capabilities; |
| 56 | break; | 56 | break; |
| 57 | case DRM_VMW_PARAM_MAX_FB_SIZE: | ||
| 58 | param->value = dev_priv->vram_size; | ||
| 59 | break; | ||
| 57 | default: | 60 | default: |
| 58 | DRM_ERROR("Illegal vmwgfx get param request: %d\n", | 61 | DRM_ERROR("Illegal vmwgfx get param request: %d\n", |
| 59 | param->param); | 62 | param->param); |
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h index 4d0842391ed..650e6bf6f69 100644 --- a/include/drm/vmwgfx_drm.h +++ b/include/drm/vmwgfx_drm.h | |||
| @@ -72,6 +72,7 @@ | |||
| 72 | #define DRM_VMW_PARAM_FIFO_OFFSET 3 | 72 | #define DRM_VMW_PARAM_FIFO_OFFSET 3 |
| 73 | #define DRM_VMW_PARAM_HW_CAPS 4 | 73 | #define DRM_VMW_PARAM_HW_CAPS 4 |
| 74 | #define DRM_VMW_PARAM_FIFO_CAPS 5 | 74 | #define DRM_VMW_PARAM_FIFO_CAPS 5 |
| 75 | #define DRM_VMW_PARAM_MAX_FB_SIZE 6 | ||
| 75 | 76 | ||
| 76 | /** | 77 | /** |
| 77 | * struct drm_vmw_getparam_arg | 78 | * struct drm_vmw_getparam_arg |
