[Intel-gfx] [PATCH 06/22] drm/i915: add power context allocation and setup on VLV

[Jesse Barnes]

The Gunit has a separate reg for this, so allocate some stolen space for
the power context and initialize the reg.

Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
---
 drivers/gpu/drm/i915/i915_drv.h        |    2 ++
 drivers/gpu/drm/i915/i915_gem_stolen.c |   41 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_reg.h        |    1 +
 3 files changed, 44 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f4ae73d..34f01a9 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -928,6 +928,8 @@ typedef struct drm_i915_private {
        struct drm_mm_node *compressed_fb;
        struct drm_mm_node *compressed_llb;
 
+       struct drm_mm_node *vlv_pctx;
+
        unsigned long last_gpu_reset;
 
        /* list of fbdev register on this device */
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c 
b/drivers/gpu/drm/i915/i915_gem_stolen.c
index f21ae17..ac11a41 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -171,11 +171,49 @@ void i915_gem_stolen_cleanup_compression(struct 
drm_device *dev)
        dev_priv->cfb_size = 0;
 }
 
+static void i915_setup_pctx(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct drm_mm_node *pctx;
+       unsigned long pctx_paddr;
+       int pctx_size = 24*1024;
+
+       pctx = drm_mm_search_free(&dev_priv->mm.stolen, pctx_size, 4096, 0);
+       if (pctx)
+               pctx = drm_mm_get_block(pctx, pctx_size, 4096);
+       if (!pctx)
+               goto err;
+
+       pctx_paddr = dev_priv->mm.stolen_base + pctx->start;
+       if (!pctx_paddr)
+               goto err_free_pctx;
+
+       dev_priv->vlv_pctx = pctx;
+       I915_WRITE(VLV_PCBR, pctx_paddr);
+
+       return;
+
+err_free_pctx:
+       drm_mm_put_block(pctx);
+err:
+       DRM_DEBUG("not enough stolen space for PCTX, disabling\n");
+}
+
+static void i915_cleanup_pctx(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+
+       I915_WRITE(VLV_PCBR, 0);
+       drm_mm_put_block(dev_priv->vlv_pctx);
+}
+
 void i915_gem_cleanup_stolen(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
 
        i915_gem_stolen_cleanup_compression(dev);
+       if (IS_VALLEYVIEW(dev) && i915_powersave)
+               i915_cleanup_pctx(dev);
        drm_mm_takedown(&dev_priv->mm.stolen);
 }
 
@@ -193,6 +231,9 @@ int i915_gem_init_stolen(struct drm_device *dev)
        /* Basic memrange allocator for stolen space */
        drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->mm.gtt->stolen_size);
 
+       if (IS_VALLEYVIEW(dev) && i915_powersave)
+               i915_setup_pctx(dev);
+
        return 0;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 286bab3..c785750 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -561,6 +561,7 @@
 #define ISR            0x020ac
 #define VLV_GUNIT_CLOCK_GATE   0x182060
 #define   GCFG_DIS             (1<<8)
+#define VLV_PCBR       0x182120
 #define VLV_IIR_RW     0x182084
 #define VLV_IER                0x1820a0
 #define VLV_IIR                0x1820a4
-- 
1.7.9.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx