xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backmerge tag 'v4.7' into drm-next

Browse Source 
Linux 4.7

As requested by Daniel Vetter as the conflicts were getting messy.
This commit is contained in:
Dave Airlie
2016-07-26 17:26:29 +10:00
parent c11dea5b02 523d939ef9
commit 5e580523d9
555 changed files with 5374 additions and 3033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
View File

@@ -1555,14 +1555,10 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
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);