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>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 17d5659cff03fd061fba580bc3c25e9616aaa3c2..729207a1e83e12c159d59f2879807d8a4f611b28 100644 (file)
--- 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 a9d4e0ab049a71065d751fef5f5fb18bd3f3fa67..10845f39124aa06548efb836f2f11ab8b08cba4b 100644 (file)
--- 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;
        }
 }