diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-22 15:24:35 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-10-22 15:24:35 +1000 |
commit | 23bfc1a339e98510f2ce25a2764a0cfe195faa9e (patch) | |
tree | 51652ad15f85d9d1367ae6f9b8641dfe46b4c501 /drivers/char/drm/mga_state.c | |
parent | 312f5726055534be1dc9dd369be13aabd2943fcb (diff) | |
parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
download | blackbird-op-linux-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.tar.gz blackbird-op-linux-23bfc1a339e98510f2ce25a2764a0cfe195faa9e.zip |
merge linus head to drm-mm branch
Diffstat (limited to 'drivers/char/drm/mga_state.c')
-rw-r--r-- | drivers/char/drm/mga_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c index ee77685069d0..47f54b5ae956 100644 --- a/drivers/char/drm/mga_state.c +++ b/drivers/char/drm/mga_state.c @@ -53,7 +53,7 @@ static void mga_emit_clip_rect(drm_mga_private_t * dev_priv, /* Force reset of DWGCTL on G400 (eliminates clip disable bit). */ - if (dev_priv->chipset == MGA_CARD_TYPE_G400) { + if (dev_priv->chipset >= MGA_CARD_TYPE_G400) { DMA_BLOCK(MGA_DWGCTL, ctx->dwgctl, MGA_LEN + MGA_EXEC, 0x80000000, MGA_DWGCTL, ctx->dwgctl, |