History

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 committed 16 years ago

Commit 1cf66e12 parents de51257 a4967de2 files · +3 −2Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/drm_edid.c +2 −2
  2. drivers/gpu/drm/radeon/radeon_pm.c +1 −0
drivers/gpu/drm/drm_edid.c+2−2
@@ -864,8 +864,8 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid, · 863 unmodified lines
864 mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,864 mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
865 false);865 false);
866 mode->hdisplay = 1366;866 mode->hdisplay = 1366;
867 mode->vsync_start = mode->vsync_start - 1;867 mode->hsync_start = mode->hsync_start - 1;
868 mode->vsync_end = mode->vsync_end - 1;868 mode->hsync_end = mode->hsync_end - 1;
869 return mode;869 return mode;
870 }870 }
871 871
drivers/gpu/drm/radeon/radeon_pm.c+1−0
@@ -333,6 +333,7 @@ static ssize_t radeon_get_pm_profile(struct device *dev, · 332 unmodified lines
333 return snprintf(buf, PAGE_SIZE, "%s\n",333 return snprintf(buf, PAGE_SIZE, "%s\n",
334 (cp == PM_PROFILE_AUTO) ? "auto" :334 (cp == PM_PROFILE_AUTO) ? "auto" :
335 (cp == PM_PROFILE_LOW) ? "low" :335 (cp == PM_PROFILE_LOW) ? "low" :
336 (cp == PM_PROFILE_MID) ? "mid" :
336 (cp == PM_PROFILE_HIGH) ? "high" : "default");337 (cp == PM_PROFILE_HIGH) ? "high" : "default");
337}338}
338 339

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t