drm/i915: BIOS and power context stolen mem handling for VLV v7

But we need to get the right stolen base and make pre-allocated objects
for BIOS stuff so we don't clobber it.  If the BIOS hasn't allocated a
power context, we allocate one here too, from stolen space as required
by the docs.

v2: fix stolen to phys if ladder (Ben)
    keep BIOS reserved space out of allocator altogether (Ben)
v3: fix mask of stolen base (Ben)
v4: clean up preallocated object on unload (Ben)
    don't zero reg on unload (Jesse)
    fix mask harder (Jesse)
v5: use unref for freeing stolen bits (Chris)
    move alloc/free to intel_pm.c (Chris)
v6: NULL pctx at disable time so error paths work (Ben)
v7: use correct PCI device for config read (Jesse)

Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 67d3510cafed..913994cd0a3a 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -62,7 +62,10 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
          * its value of TOLUD.
          */
         base = 0;
-        if (INTEL_INFO(dev)->gen >= 6) {
+        if (IS_VALLEYVIEW(dev)) {
+                pci_read_config_dword(dev->pdev, 0x5c, &base);
+                base &= ~((1<<20) - 1);
+        } else if (INTEL_INFO(dev)->gen >= 6) {
                 /* Read Base Data of Stolen Memory Register (BDSM) directly.
                  * Note that there is also a MCHBAR miror at 0x1080c0 or
                  * we could use device 2:0x5c instead.
@@ -183,6 +186,7 @@ void i915_gem_cleanup_stolen(struct drm_device *dev)
 int i915_gem_init_stolen(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
+        int bios_reserved = 0;
 
         dev_priv->mm.stolen_base = i915_stolen_to_physical(dev);
         if (dev_priv->mm.stolen_base == 0)
@@ -191,8 +195,12 @@ int i915_gem_init_stolen(struct drm_device *dev)
         DRM_DEBUG_KMS("found %zd bytes of stolen memory at %08lx\n",
                       dev_priv->gtt.stolen_size, dev_priv->mm.stolen_base);
 
+        if (IS_VALLEYVIEW(dev))
+                bios_reserved = 1024*1024; /* top 1M on VLV/BYT */
+
         /* Basic memrange allocator for stolen space */
-        drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size);
+        drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size -
+                    bios_reserved);
 
         return 0;
 }