diff options
| author | Charmaine Lee <charmainel@vmware.com> | 2014-02-06 16:13:54 -0800 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-02-11 14:15:09 +0100 |
| commit | 30ea873cf69cb861aadfc1bfc38b00b223f2065e (patch) | |
| tree | 47d9f9d72a410b8e53bc09fa64fc20331603452c | |
| parent | 8e43cda75ee311b6e8cdbe7f178f35ea2e493e2c (diff) | |
vmwgfx: Get maximum mob size from register SVGA_REG_MOB_MAX_SIZE
This patch queries the register SVGA_REG_MOB_MAX_SIZE for the
maximum size of a single mob.
Signed-off-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
| -rw-r--r-- | svga_reg.h | 9 | ||||
| -rw-r--r-- | vmwgfx_drm.h | 1 | ||||
| -rw-r--r-- | vmwgfx_drv.c | 3 | ||||
| -rw-r--r-- | vmwgfx_drv.h | 1 | ||||
| -rw-r--r-- | vmwgfx_ioctl.c | 3 |
5 files changed, 16 insertions, 1 deletions
@@ -169,10 +169,17 @@ enum { SVGA_REG_TRACES = 45, /* Enable trace-based updates even when FIFO is on */ SVGA_REG_GMRS_MAX_PAGES = 46, /* Maximum number of 4KB pages for all GMRs */ SVGA_REG_MEMORY_SIZE = 47, /* Total dedicated device memory excluding FIFO */ + SVGA_REG_COMMAND_LOW = 48, /* Lower 32 bits and submits commands */ + SVGA_REG_COMMAND_HIGH = 49, /* Upper 32 bits of command buffer PA */ SVGA_REG_MAX_PRIMARY_BOUNDING_BOX_MEM = 50, /* Max primary memory */ SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB = 51, /* Suggested limit on mob mem */ SVGA_REG_DEV_CAP = 52, /* Write dev cap index, read value */ - SVGA_REG_TOP = 53, /* Must be 1 more than the last register */ + SVGA_REG_CMD_PREPEND_LOW = 53, + SVGA_REG_CMD_PREPEND_HIGH = 54, + SVGA_REG_SCREENTARGET_MAX_WIDTH = 55, + SVGA_REG_SCREENTARGET_MAX_HEIGHT = 56, + SVGA_REG_MOB_MAX_SIZE = 57, + SVGA_REG_TOP = 58, /* Must be 1 more than the last register */ SVGA_PALETTE_BASE = 1024, /* Base of SVGA color map */ /* Next 768 (== 256*3) registers exist for colormap */ diff --git a/vmwgfx_drm.h b/vmwgfx_drm.h index e42b3f5..c28dbcb 100644 --- a/vmwgfx_drm.h +++ b/vmwgfx_drm.h @@ -87,6 +87,7 @@ #define DRM_VMW_PARAM_MAX_SURF_MEMORY 7 #define DRM_VMW_PARAM_3D_CAPS_SIZE 8 #define DRM_VMW_PARAM_MAX_MOB_MEMORY 9 +#define DRM_VMW_PARAM_MAX_MOB_SIZE 10 /** * struct drm_vmw_getparam_arg diff --git a/vmwgfx_drv.c b/vmwgfx_drv.c index 2d39d7c..5b66ac9 100644 --- a/vmwgfx_drv.c +++ b/vmwgfx_drv.c @@ -656,6 +656,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->memory_size = 512*1024*1024; } dev_priv->max_mob_pages = 0; + dev_priv->max_mob_size = 0; if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS) { uint64_t mem_size = vmw_read(dev_priv, @@ -665,6 +666,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->prim_bb_mem = vmw_read(dev_priv, SVGA_REG_MAX_PRIMARY_BOUNDING_BOX_MEM); + dev_priv->max_mob_size = + vmw_read(dev_priv, SVGA_REG_MOB_MAX_SIZE); } else dev_priv->prim_bb_mem = dev_priv->vram_size; diff --git a/vmwgfx_drv.h b/vmwgfx_drv.h index bcc0c1e..2f72d3f 100644 --- a/vmwgfx_drv.h +++ b/vmwgfx_drv.h @@ -387,6 +387,7 @@ struct vmw_private { uint32_t max_gmr_ids; uint32_t max_gmr_pages; uint32_t max_mob_pages; + uint32_t max_mob_size; uint32_t memory_size; bool has_gmr; bool has_mob; diff --git a/vmwgfx_ioctl.c b/vmwgfx_ioctl.c index 74f7bb4..1b78c5b 100644 --- a/vmwgfx_ioctl.c +++ b/vmwgfx_ioctl.c @@ -102,6 +102,9 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, vmw_fp->gb_aware = true; param->value = dev_priv->max_mob_pages * PAGE_SIZE; break; + case DRM_VMW_PARAM_MAX_MOB_SIZE: + param->value = dev_priv->max_mob_size; + break; default: DRM_ERROR("Illegal vmwgfx get param request: %d\n", param->param); |