Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/vmwgfx: Replace vram_size with prim_bb_mem for calculation of max resolution 



In the future, Scanout buffers need not be backed by VRAM and
the two definitions will differ.

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 cfe4d53e

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -628,6 +628,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	if (unlikely(ret != 0))

		goto out_err0;



	dev_priv->prim_bb_mem = dev_priv->vram_size;



	mutex_unlock(&dev_priv->hw_mutex);



	vmw_print_capabilities(dev_priv->capabilities);
@@ -640,6 +642,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
		DRM_INFO("Max dedicated hypervisor surface memory is %u kiB\n",

			 (unsigned)dev_priv->memory_size / 1024);

	}

	DRM_INFO("Maximum display memory size is %u kiB\n",

		 dev_priv->prim_bb_mem / 1024);

	DRM_INFO("VRAM at 0x%08x size is %u kiB\n",

		 dev_priv->vram_start, dev_priv->vram_size / 1024);

	DRM_INFO("MMIO at 0x%08x size is %u kiB\n",

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ struct vmw_private { 
	unsigned int io_start;

	uint32_t vram_start;

	uint32_t vram_size;

	uint32_t prim_bb_mem;

	uint32_t mmio_start;

	uint32_t mmio_size;

	uint32_t fb_max_width;

drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int vmw_getparam_ioctl(struct drm_device *dev, void *data, 
		param->value = dev_priv->fifo.capabilities;

		break;

	case DRM_VMW_PARAM_MAX_FB_SIZE:

		param->value = dev_priv->vram_size;

		param->value = dev_priv->prim_bb_mem;

		break;

	case DRM_VMW_PARAM_FIFO_HW_VERSION:

	{

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ bool vmw_kms_validate_mode_vram(struct vmw_private *dev_priv, 
				uint32_t pitch,

				uint32_t height)

{

	return ((u64) pitch * (u64) height) < (u64) dev_priv->vram_size;

	return ((u64) pitch * (u64) height) < (u64) dev_priv->prim_bb_mem;

}