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

Commit eb4f923b authored by Jakob Bornecrantz's avatar Jakob Bornecrantz Committed by Dave Airlie
Browse files

vmwgfx: Pick up the initial size from the width and height regs 



Signed-off-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b5ec427e

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+32 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ 
#define VMWGFX_CHIP_SVGAII 0

#define VMW_FB_RESERVATION 0



#define VMW_MIN_INITIAL_WIDTH 800

#define VMW_MIN_INITIAL_HEIGHT 600





/**

 * Fully encoded drm commands. Might move to vmw_drm.h

 */
@@ -387,6 +391,31 @@ void vmw_3d_resource_dec(struct vmw_private *dev_priv, 
	BUG_ON(n3d < 0);

}



/**

 * Sets the initial_[width|height] fields on the given vmw_private.

 *

 * It does so by reading SVGA_REG_[WIDTH|HEIGHT] regs and then

 * capping the value to fb_max_[width|height] fields and the

 * VMW_MIN_INITIAL_[WIDTH|HEIGHT].

 */

static void vmw_get_initial_size(struct vmw_private *dev_priv)

{

	uint32_t width;

	uint32_t height;



	width = vmw_read(dev_priv, SVGA_REG_WIDTH);

	height = vmw_read(dev_priv, SVGA_REG_HEIGHT);



	width = max_t(uint32_t, width, VMW_MIN_INITIAL_WIDTH);

	width = min_t(uint32_t, width, dev_priv->fb_max_width);



	height = max_t(uint32_t, height, VMW_MIN_INITIAL_HEIGHT);

	height = min_t(uint32_t, height, dev_priv->fb_max_height);



	dev_priv->initial_width = width;

	dev_priv->initial_height = height;

}



static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)

{

	struct vmw_private *dev_priv;
@@ -441,6 +470,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	dev_priv->mmio_size = vmw_read(dev_priv, SVGA_REG_MEM_SIZE);

	dev_priv->fb_max_width = vmw_read(dev_priv, SVGA_REG_MAX_WIDTH);

	dev_priv->fb_max_height = vmw_read(dev_priv, SVGA_REG_MAX_HEIGHT);



	vmw_get_initial_size(dev_priv);



	if (dev_priv->capabilities & SVGA_CAP_GMR) {

		dev_priv->max_gmr_descriptors =

			vmw_read(dev_priv,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct vmw_private { 
	uint32_t mmio_size;

	uint32_t fb_max_width;

	uint32_t fb_max_height;

	uint32_t initial_width;

	uint32_t initial_height;

	__le32 __iomem *mmio_virt;

	int mmio_mtrr;

	uint32_t capabilities;

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+2 −6
Original line number Diff line number Diff line
@@ -414,10 +414,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	unsigned fb_bpp, fb_depth, fb_offset, fb_pitch, fb_size;

	int ret;



	/* XXX These shouldn't be hardcoded. */

	initial_width = 800;

	initial_height = 600;



	fb_bpp = 32;

	fb_depth = 24;
@@ -425,8 +421,8 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	fb_width = min(vmw_priv->fb_max_width, (unsigned)2048);

	fb_height = min(vmw_priv->fb_max_height, (unsigned)2048);



	initial_width = min(fb_width, initial_width);

	initial_height = min(fb_height, initial_height);

	initial_width = min(vmw_priv->initial_width, fb_width);

	initial_height = min(vmw_priv->initial_height, fb_height);



	fb_pitch = fb_width * fb_bpp / 8;

	fb_size = fb_pitch * fb_height;

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+2 −2
Original line number Diff line number Diff line
@@ -354,8 +354,8 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit) 
	INIT_LIST_HEAD(&ldu->active);



	ldu->base.pref_active = (unit == 0);

	ldu->base.pref_width = 800;

	ldu->base.pref_height = 600;

	ldu->base.pref_width = dev_priv->initial_width;

	ldu->base.pref_height = dev_priv->initial_height;

	ldu->base.pref_mode = NULL;

	ldu->base.is_implicit = true;

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit) 
	sou->active_implicit = false;



	sou->base.pref_active = (unit == 0);

	sou->base.pref_width = 800;

	sou->base.pref_height = 600;

	sou->base.pref_width = dev_priv->initial_width;

	sou->base.pref_height = dev_priv->initial_height;

	sou->base.pref_mode = NULL;

	sou->base.is_implicit = true;