summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
diff options
context:
space:
mode:
authorSinclair Yeh <syeh@vmware.com>2017-03-27 11:12:27 -0700
committerSinclair Yeh <syeh@vmware.com>2017-03-31 15:21:20 -0700
commit28c954299cd2b5cb5411816c9eeaf3f51ed4638e (patch)
tree8d6afa1906526ea636035af1bbbc7f177cb02a1a /drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
parent810b3e1683d00e51c8392bcee7dc7a1c65354777 (diff)
drm/vmwgfx: Properly check display/scanout surface size
The scanout surface size is the smaller of max texture size and max STDU size. Signed-off-by: Sinclair Yeh <syeh@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 0832381242b1..c18c81f63ac3 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -2182,7 +2182,10 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
if (dev_priv->active_display_unit == vmw_du_screen_target) {
max_width = min(max_width, dev_priv->stdu_max_width);
+ max_width = min(max_width, dev_priv->texture_max_width);
+
max_height = min(max_height, dev_priv->stdu_max_height);
+ max_height = min(max_height, dev_priv->texture_max_height);
}
/* Add preferred mode */