From e266adcd1b37f846eabba39db2cf903c31f47f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 3 May 2007 12:21:57 +0200 Subject: [PATCH] i915: Use HW status page DWORD 16 instead of 5 for fence sequence. The first 16 DWORDs are reserved, number 5 for ring buffer 1 head in particular. --- shared-core/i915_dma.c | 2 +- shared-core/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 665ae839..e95b46ce 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -451,7 +451,7 @@ void i915_emit_breadcrumb(drm_device_t *dev) BEGIN_RING(&dev_priv->ring, 4); OUT_RING(CMD_STORE_DWORD_IDX); - OUT_RING(20); + OUT_RING(16 << 2); OUT_RING(dev_priv->counter); OUT_RING(0); ADVANCE_RING(); diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index f3bcc72d..805a0c15 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -426,6 +426,6 @@ extern int i915_wait_ring(drm_i915_private_t *dev_priv, drm_i915_ring_buffer_t #define CMD_OP_BIN_CONTROL ((0x3<<29)|(0x1d<<24)|(0x84<<16)|4) #define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1) -#define READ_BREADCRUMB(dev_priv) (((volatile u32*)(dev_priv->hw_status_page))[5]) +#define READ_BREADCRUMB(dev_priv) (((volatile u32*)(dev_priv->hw_status_page))[16]) #define READ_HWSP(dev_priv, reg) (((volatile u32*)(dev_priv->hw_status_page))[reg]) #endif