tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/edid: Fix the HDTV hack sync adjustment
drm/radeon/kms: fix radeon mid power profile reporting

Linus Torvalds 1cf66e16 de51257a

options
unified split
Changed files
+3 -2
drivers
gpu
drm
drm_edid.c
radeon
radeon_pm.c
+2 -2
drivers/gpu/drm/drm_edid.c
··· 864 864 mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0, 865 865 false); 866 866 mode->hdisplay = 1366; 867 - mode->vsync_start = mode->vsync_start - 1; 868 - mode->vsync_end = mode->vsync_end - 1; 867 + mode->hsync_start = mode->hsync_start - 1; 868 + mode->hsync_end = mode->hsync_end - 1; 869 869 return mode; 870 870 } 871 871
+1
drivers/gpu/drm/radeon/radeon_pm.c
··· 333 333 return snprintf(buf, PAGE_SIZE, "%s\n", 334 334 (cp == PM_PROFILE_AUTO) ? "auto" : 335 335 (cp == PM_PROFILE_LOW) ? "low" : 336 + (cp == PM_PROFILE_MID) ? "mid" : 336 337 (cp == PM_PROFILE_HIGH) ? "high" : "default"); 337 338 } 338 339