aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-11-02 15:08:22 -0500
committerEric Anholt <eric@anholt.net>2010-02-26 16:23:18 -0500
commitf6e450a6417460db6a74241de8aaab5116cac140 (patch)
treef86f3f3faffe0ac9d6485b46c440ca7fc62bdd54 /drivers/gpu/drm/i915/i915_gem.c
parent4e901fdc263d32d4cb4c59ec16ff0874129ec8c9 (diff)
drm/i915: Fix sandybridge status page setup.
The register's moved to the same location as the one for the BCS, it seems. Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 715eaac62dbd..c73da4049c81 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4581,8 +4581,13 @@ i915_gem_init_hws(struct drm_device *dev)
4581 } 4581 }
4582 dev_priv->hws_obj = obj; 4582 dev_priv->hws_obj = obj;
4583 memset(dev_priv->hw_status_page, 0, PAGE_SIZE); 4583 memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
4584 I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr); 4584 if (IS_GEN6(dev)) {
4585 I915_READ(HWS_PGA); /* posting read */ 4585 I915_WRITE(HWS_PGA_GEN6, dev_priv->status_gfx_addr);
4586 I915_READ(HWS_PGA_GEN6); /* posting read */
4587 } else {
4588 I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
4589 I915_READ(HWS_PGA); /* posting read */
4590 }
4586 DRM_DEBUG_DRIVER("hws offset: 0x%08x\n", dev_priv->status_gfx_addr); 4591 DRM_DEBUG_DRIVER("hws offset: 0x%08x\n", dev_priv->status_gfx_addr);
4587 4592
4588 return 0; 4593 return 0;