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

Backmerge tag 'v4.12-rc7' into drm-next

Browse Source 
Linux 4.12-rc7

Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7
This commit is contained in:
Dave Airlie
2017-06-27 07:24:49 +10:00
parent 338ffbf7cb c0bc126f97
commit 6d61e70ccc
461 changed files with 4150 additions and 2756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/mgag200/mgag200_mode.c
View File

@@ -1173,7 +1173,10 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
if (IS_G200_SE(mdev)) {
if (mdev->unique_rev_id >= 0x02) {
if (mdev->unique_rev_id >= 0x04) {
WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
WREG8(MGAREG_CRTCEXT_DATA, 0);
} else if (mdev->unique_rev_id >= 0x02) {
u8 hi_pri_lvl;
u32 bpp;
u32 mb;
@@ -1639,6 +1642,10 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
if (mga_vga_calculate_mode_bandwidth(mode, bpp)
> (30100 * 1024))
return MODE_BANDWIDTH;
} else {
if (mga_vga_calculate_mode_bandwidth(mode, bpp)
> (55000 * 1024))
return MODE_BANDWIDTH;
}
} else if (mdev->type == G200_WB) {
if (mode->hdisplay > 1280)