Attachment 30296 Details for Bug 24479 – fix

[patch] fix

0001-drm-radeon-kms-properly-handle-mode-id-with-native.patch (text/plain), 1.80 KB, created by Alex Deucher on 2009-10-12 10:08:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-10-12 10:08:35 UTC

Size: 1.80 KB

patch

obsolete

>From ccef8b311a1b9345cb99177a2cf2c37e5667622b Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Mon, 12 Oct 2009 11:25:05 -0400
>Subject: [PATCH] drm/radeon/kms: properly handle mode id with native mode changes
>
>drm modes are objects with indentifiers.  Make sure to preserve
>the mode id when copying mode params.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/radeon_connectors.c |    3 +--
> drivers/gpu/drm/radeon/radeon_encoders.c   |    2 ++
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
>index 17d5659..729207a 100644
>--- a/drivers/gpu/drm/radeon/radeon_connectors.c
>+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>@@ -183,8 +183,7 @@ static struct drm_display_mode *radeon_fp_native_mode(struct drm_encoder *encode
> 	if (native_mode->hdisplay != 0 &&
> 	    native_mode->vdisplay != 0 &&
> 	    native_mode->clock != 0) {
>-		mode = drm_mode_create(dev);
>-		*mode = *native_mode;
>+		mode = drm_mode_duplicate(dev, native_mode);
> 		mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
> 		drm_mode_set_name(mode);
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
>index a9d4e0a..10845f3 100644
>--- a/drivers/gpu/drm/radeon/radeon_encoders.c
>+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
>@@ -175,11 +175,13 @@ void radeon_rmx_mode_fixup(struct drm_encoder *encoder,
> 
> 	if (mode->hdisplay < native_mode->hdisplay ||
> 	    mode->vdisplay < native_mode->vdisplay) {
>+		int mode_id = adjusted_mode->base.id;
> 		*adjusted_mode = *native_mode;
> 		if (!ASIC_IS_AVIVO(rdev)) {
> 			adjusted_mode->hdisplay = mode->hdisplay;
> 			adjusted_mode->vdisplay = mode->vdisplay;
> 		}
>+		adjusted_mode->base.id = mode_id;
> 	}
> }
> 
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 24479: 30295 | 30296 | 30297

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.