Merge branch 'drm-next-3.10' of git://people.freedesktop.org/~agd5f/linux into drm...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / i915_dma.c

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 4fa6beb14c7741bf42a1f30a766b855d3494c406..4be58e3b8e4fa46726a182bc7d10e86957ec9980 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1452,6 +1452,22 @@ static void i915_dump_device_info(struct drm_i915_private *dev_priv)
 #undef DEV_INFO_SEP
 }
 
+/**
+ * intel_early_sanitize_regs - clean up BIOS state
+ * @dev: DRM device
+ *
+ * This function must be called before we do any I915_READ or I915_WRITE. Its
+ * purpose is to clean up any state left by the BIOS that may affect us when
+ * reading and/or writing registers.
+ */
+static void intel_early_sanitize_regs(struct drm_device *dev)
+{
+       struct drm_i915_private *dev_priv = dev->dev_private;
+
+       if (IS_HASWELL(dev))
+               I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM);
+}
+
 /**
  * i915_driver_load - setup chip and create an initial config
  * @dev: DRM device
@@ -1542,6 +1558,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
                goto put_gmch;
        }
 
+       intel_early_sanitize_regs(dev);
+
        aperture_size = dev_priv->gtt.mappable_end;
 
        dev_priv->gtt.mappable =
@@ -1612,14 +1630,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        mutex_init(&dev_priv->rps.hw_lock);
        mutex_init(&dev_priv->modeset_restore_lock);
 
-       if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
-               dev_priv->num_pipe = 3;
-       else if (IS_MOBILE(dev) || !IS_GEN2(dev))
-               dev_priv->num_pipe = 2;
-       else
-               dev_priv->num_pipe = 1;
+       dev_priv->num_plane = 1;
+       if (IS_VALLEYVIEW(dev))
+               dev_priv->num_plane = 2;
 
-       ret = drm_vblank_init(dev, dev_priv->num_pipe);
+       ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes);
        if (ret)
                goto out_gem_unload;