redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/vmwgfx: Treat out-of-range initial width and height as host errors 

And assign the initial width and height to the minimum in that case.
Strange values (-1) from these registers have been reported by users.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
hifive-unleashed-5.1
Thomas Hellstrom 2012-02-09 16:56:47 +01:00 committed by Dave Airlie
parent eb4f923b1c
commit 67d4a87b0a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
View File

@ -395,7 +395,9 @@ void vmw_3d_resource_dec(struct vmw_private *dev_priv,
* 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
* clamping the value to fb_max_[width|height] fields and the
* VMW_MIN_INITIAL_[WIDTH|HEIGHT].
* If the values appear to be invalid, set them to
* VMW_MIN_INITIAL_[WIDTH|HEIGHT].
*/
static void vmw_get_initial_size(struct vmw_private *dev_priv)
@ -407,10 +409,18 @@ static void vmw_get_initial_size(struct vmw_private *dev_priv)
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);
if (width > dev_priv->fb_max_width ||
height > dev_priv->fb_max_height) {
/*
* This is a host error and shouldn't occur.
*/
width = VMW_MIN_INITIAL_WIDTH;
height = VMW_MIN_INITIAL_HEIGHT;
}
dev_priv->initial_width = width;
dev_priv->initial_height = height;