Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 310a82c8 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix legacy rmx 



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

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Tested-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent edc664e3

drivers/gpu/drm/radeon/radeon_encoders.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/radeon/radeon_legacy_crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}