mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
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
This commit is contained in:
commit
1cf66e1616
2 changed files with 3 additions and 2 deletions
|
@ -864,8 +864,8 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid,
|
|||
mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
|
||||
false);
|
||||
mode->hdisplay = 1366;
|
||||
mode->vsync_start = mode->vsync_start - 1;
|
||||
mode->vsync_end = mode->vsync_end - 1;
|
||||
mode->hsync_start = mode->hsync_start - 1;
|
||||
mode->hsync_end = mode->hsync_end - 1;
|
||||
return mode;
|
||||
}
|
||||
|
||||
|
|
|
@ -333,6 +333,7 @@ static ssize_t radeon_get_pm_profile(struct device *dev,
|
|||
return snprintf(buf, PAGE_SIZE, "%s\n",
|
||||
(cp == PM_PROFILE_AUTO) ? "auto" :
|
||||
(cp == PM_PROFILE_LOW) ? "low" :
|
||||
(cp == PM_PROFILE_MID) ? "mid" :
|
||||
(cp == PM_PROFILE_HIGH) ? "high" : "default");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue