[PATCH] drm/radeon/kms: fix regression in RMX code

[PATCH] drm/radeon/kms: fix regression in RMX code

[Alex Deucher]

caused by d65d65b175a29bd7ea2bb69c046419329c4a5db7

need to update the radeon crtc priv native mode before using it.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=30049

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
 drivers/gpu/drm/radeon/radeon_display.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index c7f5017..8c987c9 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1140,14 +1140,14 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
 				radeon_crtc->rmx_type = radeon_encoder->rmx_type;
 			else
 				radeon_crtc->rmx_type = RMX_OFF;
-			src_v = crtc->mode.vdisplay;
-			dst_v = radeon_crtc->native_mode.vdisplay;
-			src_h = crtc->mode.hdisplay;
-			dst_h = radeon_crtc->native_mode.hdisplay;
 			/* copy native mode */
 			memcpy(&radeon_crtc->native_mode,
 			       &radeon_encoder->native_mode,
 				sizeof(struct drm_display_mode));
+			src_v = crtc->mode.vdisplay;
+			dst_v = radeon_crtc->native_mode.vdisplay;
+			src_h = crtc->mode.hdisplay;
+			dst_h = radeon_crtc->native_mode.hdisplay;
 
 			/* fix up for overscan on hdmi */
 			if (ASIC_IS_AVIVO(rdev) &&
-- 
1.7.1.1

Re: [PATCH] drm/radeon/kms: fix regression in RMX code

[Alex Deucher]

Ignore this one; unified fix on the way.

On Tue, Sep 7, 2010 at 1:20 PM, Alex Deucher <alexdeucher@gmail.com> wrote:
> caused by d65d65b175a29bd7ea2bb69c046419329c4a5db7
>
> need to update the radeon crtc priv native mode before using it.
>
> Fixes:
> https://bugs.freedesktop.org/show_bug.cgi?id=30049
>
> Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
> ---
>  drivers/gpu/drm/radeon/radeon_display.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index c7f5017..8c987c9 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -1140,14 +1140,14 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
>                                radeon_crtc->rmx_type = radeon_encoder->rmx_type;
>                        else
>                                radeon_crtc->rmx_type = RMX_OFF;
> -                       src_v = crtc->mode.vdisplay;
> -                       dst_v = radeon_crtc->native_mode.vdisplay;
> -                       src_h = crtc->mode.hdisplay;
> -                       dst_h = radeon_crtc->native_mode.hdisplay;
>                        /* copy native mode */
>                        memcpy(&radeon_crtc->native_mode,
>                               &radeon_encoder->native_mode,
>                                sizeof(struct drm_display_mode));
> +                       src_v = crtc->mode.vdisplay;
> +                       dst_v = radeon_crtc->native_mode.vdisplay;
> +                       src_h = crtc->mode.hdisplay;
> +                       dst_h = radeon_crtc->native_mode.hdisplay;
>
>                        /* fix up for overscan on hdmi */
>                        if (ASIC_IS_AVIVO(rdev) &&
> --
> 1.7.1.1
>
>