drm/radeon/kms: fix legacy rmx

This makes 640x480 on my R100 work again, both
in aspect and centered mode.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Tested-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

3 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 547fe105e19f..ccba95f83d11 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -233,6 +233,8 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
                 if (!ASIC_IS_AVIVO(rdev)) {
                         adjusted_mode->hdisplay = mode->hdisplay;
                         adjusted_mode->vdisplay = mode->vdisplay;
+                        adjusted_mode->crtc_hdisplay = mode->hdisplay;
+                        adjusted_mode->crtc_vdisplay = mode->vdisplay;
                 }
                 adjusted_mode->base.id = mode_id;
         }
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,
 }
 
 static void radeon_legacy_rmx_mode_set(struct drm_crtc *crtc,
-                                       struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted_mode)
+                                       struct drm_display_mode *mode)
 {
         struct drm_device *dev = crtc->dev;
         struct radeon_device *rdev = dev->dev_private;
@@ -1059,7 +1058,7 @@ static int radeon_crtc_mode_set(struct drm_crtc *crtc,
         radeon_set_pll(crtc, adjusted_mode);
         radeon_overscan_setup(crtc, adjusted_mode);
         if (radeon_crtc->crtc_id == 0) {
-                radeon_legacy_rmx_mode_set(crtc, mode, adjusted_mode);
+                radeon_legacy_rmx_mode_set(crtc, adjusted_mode);
         } else {
                 if (radeon_crtc->rmx_type != RMX_OFF) {
                         /* FIXME: only first crtc has rmx what should we
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index df00515e81fa..981508ff7037 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -207,6 +207,8 @@ static bool radeon_legacy_mode_fixup(struct drm_encoder *encoder,
                 *adjusted_mode = *native_mode;
                 adjusted_mode->hdisplay = mode->hdisplay;
                 adjusted_mode->vdisplay = mode->vdisplay;
+                adjusted_mode->crtc_hdisplay = mode->hdisplay;
+                adjusted_mode->crtc_vdisplay = mode->vdisplay;
                 adjusted_mode->base.id = mode_id;
         }