diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:09:19 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:13:50 +0200 |
| commit | 17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9 (patch) | |
| tree | a45f944e15a2600ec20ca4ec11b23d4641095e8e /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
| parent | b7e4ab50418d5b34ab0dae95193dd71190e1fb50 (diff) | |
| parent | c86907b59f505863ec7839471e889330982a596e (diff) | |
| download | op-kernel-dev-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.zip op-kernel-dev-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.tar.gz | |
Merge branch '3.15/dss-dt' into 3.15/fbdev
Merge OMAP DSS DT support
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 3bdc0ad..0083cbf 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -667,6 +667,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, @@ -676,6 +677,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; |
