diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-01 12:31:37 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-21 14:19:53 -0700 |
| commit | 67d15215660407b07265c37d60ea5cac8930cef9 (patch) | |
| tree | 285904e5d9ba2b99d738e862caca1f2c1d3b60f6 /shared-core/i915_drv.h | |
| parent | 4d83a751b421ec3f3e0c572070c3bc295b9adbcc (diff) | |
intel-gem: Set up HWS when it needs a vaddr during GEM init.
This requires an updated 2D driver to not try to set it up as well.
Diffstat (limited to 'shared-core/i915_drv.h')
| -rw-r--r-- | shared-core/i915_drv.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index a9a431c4..c57c292f 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -114,6 +114,7 @@ typedef struct drm_i915_private { uint32_t counter; unsigned int status_gfx_addr; drm_local_map_t hws_map; + struct drm_gem_object *hws_obj; unsigned int cpp; @@ -854,6 +855,11 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define RING_VALID 0x00000001 #define RING_INVALID 0x00000000 +/* Hardware status page address */ +#define HWS_PGA 0x2080 +#define HWS_ADDRESS_MASK 0xfffff000 +#define HWS_START_ADDRES_SHIFT 4 + /* Instruction parser error reg: */ #define IPEIR 0x2088 |