diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 01:49:08 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 01:49:08 -0500 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /drivers/gpu/drm/radeon/radeon_legacy_crtc.c | |
| parent | 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 (diff) | |
| parent | 56d45b62ce622a003da972428fdbba2b42102efb (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_legacy_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c index b82ede98e152..cc27485a07ad 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | |||
| @@ -43,8 +43,7 @@ static void radeon_overscan_setup(struct drm_crtc *crtc, | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc, | 45 | static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc, |
| 46 | struct drm_display_mode *mode, | 46 | struct drm_display_mode *mode) |
| 47 | struct drm_display_mode *adjusted_mode) | ||
| 48 | { | 47 | { |
| 49 | struct drm_device *dev = crtc->dev; | 48 | struct drm_device *dev = crtc->dev; |
| 50 | struct radeon_device *rdev = dev->dev_private; | 49 | struct radeon_device *rdev = dev->dev_private; |
| @@ -1059,7 +1058,7 @@ static int radeon_crtc_mode_set(struct drm_crtc *crtc, | |||
| 1059 | radeon_set_pll(crtc, adjusted_mode); | 1058 | radeon_set_pll(crtc, adjusted_mode); |
| 1060 | radeon_overscan_setup(crtc, adjusted_mode); | 1059 | radeon_overscan_setup(crtc, adjusted_mode); |
| 1061 | if (radeon_crtc->crtc_id == 0) { | 1060 | if (radeon_crtc->crtc_id == 0) { |
| 1062 | radeon_legacy_rmx_mode_set(crtc, mode, adjusted_mode); | 1061 | radeon_legacy_rmx_mode_set(crtc, adjusted_mode); |
| 1063 | } else { | 1062 | } else { |
| 1064 | if (radeon_crtc->rmx_type != RMX_OFF) { | 1063 | if (radeon_crtc->rmx_type != RMX_OFF) { |
| 1065 | /* FIXME: only first crtc has rmx what should we | 1064 | /* FIXME: only first crtc has rmx what should we |