Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_kms.c
diff --git
a/kernel/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
b/kernel/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index
7c2e118
..
060e5c6
100644
(file)
--- a/
kernel/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/
kernel/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@
-1538,14
+1538,10
@@
int vmw_du_connector_fill_modes(struct drm_connector *connector,
DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC)
};
int i;
DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC)
};
int i;
- u32 assumed_bpp =
2
;
+ u32 assumed_bpp =
4
;
- /*
- * If using screen objects, then assume 32-bpp because that's what the
- * SVGA device is assuming
- */
- if (dev_priv->active_display_unit == vmw_du_screen_object)
- assumed_bpp = 4;
+ if (dev_priv->assume_16bpp)
+ assumed_bpp = 2;
if (dev_priv->active_display_unit == vmw_du_screen_target) {
max_width = min(max_width, dev_priv->stdu_max_width);
if (dev_priv->active_display_unit == vmw_du_screen_target) {
max_width = min(max_width, dev_priv->stdu_max_width);