summaryrefslogtreecommitdiff
path: root/shared-core/i915_drv.h
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-01-22 15:16:01 -0800
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-01-22 15:16:01 -0800
commit531f25cfe9d0319f78fe58260bfed08d5e3e8bcc (patch)
treef1e9e1957b016fcccbeb9fc4f97f1c44a0230e92 /shared-core/i915_drv.h
parent893e311999d1565943899d73c56c674fc9b6e502 (diff)
Correct vblank count value
The frame count registers don't increment until the start of the next frame, so make sure we return an incremented count if called during the actual vblank period.
Diffstat (limited to 'shared-core/i915_drv.h')
-rw-r--r--shared-core/i915_drv.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index b8d027d7..2c1f2c2e 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -471,6 +471,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define I915REG_INT_ENABLE_R 0x020a0
#define I915REG_INSTPM 0x020c0
+#define PIPEADSL 0x70000
+#define PIPEBDSL 0x71000
+
#define I915REG_PIPEASTAT 0x70024
#define I915REG_PIPEBSTAT 0x71024
/*
@@ -790,6 +793,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define BCLRPAT_B 0x61020
#define VSYNCSHIFT_B 0x61028
+#define HACTIVE_MASK 0x00000fff
+#define VBLANK_START_MASK 0x00001fff
+
#define PP_STATUS 0x61200
# define PP_ON (1 << 31)
/**