summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915_drv.h
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-09-02 20:02:35 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-09-02 20:02:35 +0000
commite638c5d4ba7095c89965d1906c0314fc1ee09c1a (patch)
treee70a913e470bab0fde768934e3a780ffc14e4c41 /sys/dev/pci/drm/i915_drv.h
parent359b97098eaf6797095d750331f36fef7b85ca1b (diff)
Track progress inside of batchbuffers so we know the hardware isn't
wedged. This avoids early temination of long-running commands. From Keith Packard, via drm git. Tested by several on various chipsets.
Diffstat (limited to 'sys/dev/pci/drm/i915_drv.h')
-rw-r--r--sys/dev/pci/drm/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915_drv.h
index cf9d112bcc5..2f2da9365d7 100644
--- a/sys/dev/pci/drm/i915_drv.h
+++ b/sys/dev/pci/drm/i915_drv.h
@@ -562,6 +562,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define PRB1_HEAD 0x02044 /* 915+ only */
#define PRB1_START 0x02048 /* 915+ only */
#define PRB1_CTL 0x0204c /* 915+ only */
+#define ACTHD_I965 0x02074
#define HWS_PGA 0x02080
#define IPEIR 0x02088
#define NOPID 0x02094
@@ -592,6 +593,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define EMR 0x020b4
#define ESR 0x020b8
#define INSTPM 0x020c0
+#define ACTHD 0x020c8
#define FW_BLC 0x020d8
#define FW_BLC_SELF 0x020e0 /* 915+ only */
#define MI_ARB_STATE 0x020e4 /* 915+ only */