Commit afb0e50f authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Read bounding box memory from the appropriate register 



Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarZack Rusin <zackr@vmware.com>
parent 6da768aa

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -650,12 +650,17 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
				 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);

				 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);





		dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;

		dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;

	}

		dev_priv->prim_bb_mem =

			vmw_read(dev_priv,

				 SVGA_REG_MAX_PRIMARY_BOUNDING_BOX_MEM);

	} else

		dev_priv->prim_bb_mem = dev_priv->vram_size;





	ret = vmw_dma_masks(dev_priv);

	ret = vmw_dma_masks(dev_priv);

	if (unlikely(ret != 0))

	if (unlikely(ret != 0))

		goto out_err0;

		goto out_err0;





	if (unlikely(dev_priv->prim_bb_mem < dev_priv->vram_size))

		dev_priv->prim_bb_mem = dev_priv->vram_size;

		dev_priv->prim_bb_mem = dev_priv->vram_size;





	mutex_unlock(&dev_priv->hw_mutex);

	mutex_unlock(&dev_priv->hw_mutex);