summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/mga_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-10-20 23:49:00 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-21 12:18:09 -0700
commite29971f9a4ca08c3c31b98be96c293ef9f7dcc32 (patch)
tree9542decf5a838b36bee07fd5961e059d328da128 /drivers/char/drm/mga_drv.h
parent5d96551541a8f5521dcc8c634a18d42a3d349ec9 (diff)
downloadblackbird-op-linux-e29971f9a4ca08c3c31b98be96c293ef9f7dcc32.tar.gz
blackbird-op-linux-e29971f9a4ca08c3c31b98be96c293ef9f7dcc32.zip
[PATCH] drm: another mga bug
The wrong state emission routines were being called for G550, and consistent maps weren't correctly mapped... Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/drm/mga_drv.h')
-rw-r--r--drivers/char/drm/mga_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index b22fdbd4f830..6059c5a5b105 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -227,7 +227,7 @@ static inline u32 _MGA_READ(u32 *addr)
#define MGA_EMIT_STATE( dev_priv, dirty ) \
do { \
if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) { \
- if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) { \
+ if ( dev_priv->chipset >= MGA_CARD_TYPE_G400 ) { \
mga_g400_emit_state( dev_priv ); \
} else { \
mga_g200_emit_state( dev_priv ); \
OpenPOWER on IntegriCloud