diff mbox

drm/mgag200: Add missing write to index before accessing data register

Message ID 20130531203307.787D87F45F@pluton.matrox.com (mailing list archive)
State New, archived
Headers show

Commit Message

Christopher Harvey May 31, 2013, 8:33 p.m. UTC 
This is a bug fix for some versions of g200se cards while doing
mode-setting.

Signed-off-by: Christopher Harvey <charvey@matrox.com>
Tested-by: Julia Lemire <jlemire@matrox.com>
Acked-by: Julia Lemire <jlemire@matrox.com>Julia Lemire <jlemire@matrox.com>
---
 drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Christopher Harvey May 31, 2013, 8:40 p.m. UTC | #1 
On Fri, May 31 2013, Christopher Harvey <charvey@matrox.com> wrote:
> This is a bug fix for some versions of g200se cards while doing
> mode-setting.
>
> Signed-off-by: Christopher Harvey <charvey@matrox.com>
> Tested-by: Julia Lemire <jlemire@matrox.com>
> Acked-by: Julia Lemire <jlemire@matrox.com>Julia Lemire <jlemire@matrox.com>

hmmm, feel free to delete the extra "Julia Lemire <jlemire@matrox.com>"
before applying. (or I could just re-send)

thanks
diff mbox

Patch

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index deed0bd..5b1a9e7 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1034,13 +1034,14 @@  static int mga_crtc_mode_set(struct drm_crtc *crtc,
 			else
 				hi_pri_lvl = 5;
 
-			WREG8(0x1fde, 0x06);
-			WREG8(0x1fdf, hi_pri_lvl);
+			WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
+			WREG8(MGAREG_CRTCEXT_DATA, hi_pri_lvl);
 		} else {
+			WREG8(MGAREG_CRTCEXT_INDEX, 0x06);
 			if (mdev->reg_1e24 >= 0x01)
-				WREG8(0x1fdf, 0x03);
+				WREG8(MGAREG_CRTCEXT_DATA, 0x03);
 			else
-				WREG8(0x1fdf, 0x04);
+				WREG8(MGAREG_CRTCEXT_DATA, 0x04);
 		}
 	}
 	return 0;