Эх сурвалжийг харах

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>
Thomas Hellstrom 12 жил өмнө
parent
commit
311474dbdc

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

@@ -40,9 +40,9 @@
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_module.h>
 #include "vmwgfx_fence.h"
 #include "vmwgfx_fence.h"
 
 
-#define VMWGFX_DRIVER_DATE "20120209"
+#define VMWGFX_DRIVER_DATE "20121114"
 #define VMWGFX_DRIVER_MAJOR 2
 #define VMWGFX_DRIVER_MAJOR 2
-#define VMWGFX_DRIVER_MINOR 4
+#define VMWGFX_DRIVER_MINOR 5
 #define VMWGFX_DRIVER_PATCHLEVEL 0
 #define VMWGFX_DRIVER_PATCHLEVEL 0
 #define VMWGFX_FILE_PAGE_OFFSET 0x00100000
 #define VMWGFX_FILE_PAGE_OFFSET 0x00100000
 #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)
 #define VMWGFX_FIFO_STATIC_SIZE (1024*1024)

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

@@ -79,6 +79,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data,
 					SVGA_FIFO_3D_CAPS + 1);
 					SVGA_FIFO_3D_CAPS + 1);
 		param->value *= sizeof(uint32_t);
 		param->value *= sizeof(uint32_t);
 		break;
 		break;
+	case DRM_VMW_PARAM_MAX_MOB_MEMORY:
+		param->value = dev_priv->max_mob_pages * PAGE_SIZE;
+		break;
 	default:
 	default:
 		DRM_ERROR("Illegal vmwgfx get param request: %d\n",
 		DRM_ERROR("Illegal vmwgfx get param request: %d\n",
 			  param->param);
 			  param->param);

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

@@ -86,6 +86,7 @@
 #define DRM_VMW_PARAM_FIFO_HW_VERSION  6
 #define DRM_VMW_PARAM_FIFO_HW_VERSION  6
 #define DRM_VMW_PARAM_MAX_SURF_MEMORY  7
 #define DRM_VMW_PARAM_MAX_SURF_MEMORY  7
 #define DRM_VMW_PARAM_3D_CAPS_SIZE     8
 #define DRM_VMW_PARAM_3D_CAPS_SIZE     8
+#define DRM_VMW_PARAM_MAX_MOB_MEMORY   9
 
 
 /**
 /**
  * struct drm_vmw_getparam_arg
  * struct drm_vmw_getparam_arg