drm/vmwgfx: Add a parameter to get max MOB memory size

Also bump minor to signal a GB-aware kernel module

Thomas Hellstrom committed 13 years ago

Commit 311474d1 parent 1d7a5cb3 files · +6 −2Browse files

Unified · Split

3 files

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +2 −2
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +3 −0
include/uapi/drm/vmwgfx_drm.h +1 −0

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h+2−2

@@ -40,9 +40,9 @@ · 39 unmodified lines
40	40	#include <drm/ttm/ttm_module.h>
41	41	#include "vmwgfx_fence.h"
42	42
43		−#define VMWGFX_DRIVER_DATE "20120209"
	43	+#define VMWGFX_DRIVER_DATE "20121114"
44	44	#define VMWGFX_DRIVER_MAJOR 2
45		−#define VMWGFX_DRIVER_MINOR 4
	45	+#define VMWGFX_DRIVER_MINOR 5
46	46	#define VMWGFX_DRIVER_PATCHLEVEL 0
47	47	#define VMWGFX_FILE_PAGE_OFFSET 0x00100000
48	48	#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c+3−0

@@ -79,6 +79,9 @@ int vmw_getparam_ioctl(struct drm_device dev, void data, · 78 unmodified lines
79	79	SVGA_FIFO_3D_CAPS + 1);
80	80	param->value *= sizeof(uint32_t);
81	81	break;
	82	+ case DRM_VMW_PARAM_MAX_MOB_MEMORY:
	83	+ param->value = dev_priv->max_mob_pages * PAGE_SIZE;
	84	+ break;
82	85	default:
83	86	DRM_ERROR("Illegal vmwgfx get param request: %d\n",
84	87	param->param);

include/uapi/drm/vmwgfx_drm.h+1−0

@@ -86,6 +86,7 @@ · 85 unmodified lines
86	86	#define DRM_VMW_PARAM_FIFO_HW_VERSION 6
87	87	#define DRM_VMW_PARAM_MAX_SURF_MEMORY 7
88	88	#define DRM_VMW_PARAM_3D_CAPS_SIZE 8
	89	+#define DRM_VMW_PARAM_MAX_MOB_MEMORY 9
89	90
90	91	/**
91	92	* struct drm_vmw_getparam_arg