1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 28c812a0c634..4d56dfd25e04 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -40,11 +40,11 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
-        u32 last_head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+        u32 last_head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
         int i;
 
         for (i = 0; i < 10000; i++) {
-                ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+                ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
                 ring->space = ring->head - (ring->tail + 8);
                 if (ring->space < 0)
                         ring->space += ring->Size;
@@ -67,8 +67,8 @@ void i915_kernel_lost_context(struct drm_device * dev)
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
 
-        ring->head = I915_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
-        ring->tail = I915_READ(LP_RING + RING_TAIL) & TAIL_ADDR;
+        ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
+        ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR;
         ring->space = ring->head - (ring->tail + 8);
         if (ring->space < 0)
                 ring->space += ring->Size;
@@ -98,13 +98,13 @@ static int i915_dma_cleanup(struct drm_device * dev)
                 drm_pci_free(dev, dev_priv->status_page_dmah);
                 dev_priv->status_page_dmah = NULL;
                 /* Need to rewrite hardware status page */
-                I915_WRITE(0x02080, 0x1ffff000);
+                I915_WRITE(HWS_PGA, 0x1ffff000);
         }
 
         if (dev_priv->status_gfx_addr) {
                 dev_priv->status_gfx_addr = 0;
                 drm_core_ioremapfree(&dev_priv->hws_map, dev);
-                I915_WRITE(0x2080, 0x1ffff000);
+                I915_WRITE(HWS_PGA, 0x1ffff000);
         }
 
         return 0;
@@ -170,7 +170,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
                 dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
 
                 memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-                I915_WRITE(0x02080, dev_priv->dma_status_page);
+                I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
         }
         DRM_DEBUG("Enabled hardware status page\n");
         return 0;
@@ -201,9 +201,9 @@ static int i915_dma_resume(struct drm_device * dev)
         DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 
         if (dev_priv->status_gfx_addr != 0)
-                I915_WRITE(0x02080, dev_priv->status_gfx_addr);
+                I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
         else
-                I915_WRITE(0x02080, dev_priv->dma_status_page);
+                I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
         DRM_DEBUG("Enabled hardware status page\n");
 
         return 0;
@@ -402,8 +402,8 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
                 dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1;
 
         BEGIN_LP_RING(4);
-        OUT_RING(CMD_STORE_DWORD_IDX);
-        OUT_RING(20);
+        OUT_RING(MI_STORE_DWORD_INDEX);
+        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
         OUT_RING(0);
         ADVANCE_LP_RING();
@@ -505,7 +505,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
         i915_kernel_lost_context(dev);
 
         BEGIN_LP_RING(2);
-        OUT_RING(INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE);
+        OUT_RING(MI_FLUSH | MI_READ_FLUSH);
         OUT_RING(0);
         ADVANCE_LP_RING();
 
@@ -530,8 +530,8 @@ static int i915_dispatch_flip(struct drm_device * dev)
         dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
 
         BEGIN_LP_RING(4);
-        OUT_RING(CMD_STORE_DWORD_IDX);
-        OUT_RING(20);
+        OUT_RING(MI_STORE_DWORD_INDEX);
+        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
         OUT_RING(0);
         ADVANCE_LP_RING();
@@ -728,8 +728,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
         dev_priv->hw_status_page = dev_priv->hws_map.handle;
 
         memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
-        I915_WRITE(0x02080, dev_priv->status_gfx_addr);
-        DRM_DEBUG("load hws 0x2080 with gfx mem 0x%x\n",
+        I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
+        DRM_DEBUG("load hws HWS_PGA with gfx mem 0x%x\n",
                         dev_priv->status_gfx_addr);
         DRM_DEBUG("load hws at %p\n", dev_priv->hw_status_page);
         return 0;