xserver/hw/kdrive/ati ati.c,1.17,1.18
Keith Packard <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: keithp
Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory pdx:/tmp/cvs-serv21241
Modified Files:
ati.c
Log Message:
Check for mmio before restoring crtc/crtc2 pitch registers
Index: ati.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ati.c 22 Jul 2004 18:17:59 -0000 1.17
+++ ati.c 24 Jul 2004 17:02:49 -0000 1.18
@@ -612,8 +612,11 @@
ATICardInfo *atic = card->driver;
char *mmio = atic->reg_base;
- MMIO_OUT32(mmio, ATI_REG_CRTC_PITCH, atic->crtc_pitch);
- MMIO_OUT32(mmio, ATI_REG_CRTC2_PITCH, atic->crtc2_pitch);
+ if (mmio)
+ {
+ MMIO_OUT32(mmio, ATI_REG_CRTC_PITCH, atic->crtc_pitch);
+ MMIO_OUT32(mmio, ATI_REG_CRTC2_PITCH, atic->crtc2_pitch);
+ }
ATIUnmapReg(card, atic);
atic->backend_funcs.restore(card);