Commit 0cdad7e8 authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie

i915: Use non-reserved status page index for breadcrumb

Dwords 0 through 0x1f are reserved for use by the hardware. Move the GEM
breadcrumb from 0x10 to 0x20 to keep out of this area.
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 630681d9
...@@ -597,16 +597,18 @@ extern void opregion_enable_asle(struct drm_device *dev); ...@@ -597,16 +597,18 @@ extern void opregion_enable_asle(struct drm_device *dev);
* MI_STORE_DATA_IMM. * MI_STORE_DATA_IMM.
* *
* The following dwords have a reserved meaning: * The following dwords have a reserved meaning:
* 0: ISR copy, updated when an ISR bit not set in the HWSTAM changes. * 0x00: ISR copy, updated when an ISR bit not set in the HWSTAM changes.
* 4: ring 0 head pointer * 0x04: ring 0 head pointer
* 5: ring 1 head pointer (915-class) * 0x05: ring 1 head pointer (915-class)
* 6: ring 2 head pointer (915-class) * 0x06: ring 2 head pointer (915-class)
* 0x10-0x1b: Context status DWords (GM45)
* 0x1f: Last written status offset. (GM45)
* *
* The area from dword 0x10 to 0x3ff is available for driver usage. * The area from dword 0x20 to 0x3ff is available for driver usage.
*/ */
#define READ_HWSP(dev_priv, reg) (((volatile u32*)(dev_priv->hw_status_page))[reg]) #define READ_HWSP(dev_priv, reg) (((volatile u32*)(dev_priv->hw_status_page))[reg])
#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, 5) #define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, 5)
#define I915_GEM_HWS_INDEX 0x10 #define I915_GEM_HWS_INDEX 0x20
extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment