drm/i915: sprite support for ValleyView v4

No constant alpha yet though, that needs a new ioctl and/or property to
get/set.

v2: use drm_plane_format_cpp (Ville)
    fix up vlv_disable_plane, remove IVB bits (Ville)
    remove error path rework (Ville)
    fix component order confusion (Ville)
    clean up platform init (Ville)
    use compute_offset_xtiled (Ville)
v3: fix up more format confusion (Ville)
    update to new page offset function (Ville)
v4: remove incorrect formats from framebuffer_init (Ville)

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0e172ced8f0e..2ee38660a5a5 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8867,7 +8867,7 @@ void intel_modeset_init_hw(struct drm_device *dev)
 void intel_modeset_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        int i, ret;
+        int i, j, ret;
 
         drm_mode_config_init(dev);
 
@@ -8903,9 +8903,12 @@ void intel_modeset_init(struct drm_device *dev)
 
         for (i = 0; i < INTEL_INFO(dev)->num_pipes; i++) {
                 intel_crtc_init(dev, i);
-                ret = intel_plane_init(dev, i);
-                if (ret)
-                        DRM_DEBUG_KMS("plane %d init failed: %d\n", i, ret);
+                for (j = 0; j < dev_priv->num_plane; j++) {
+                        ret = intel_plane_init(dev, i, j);
+                        if (ret)
+                                DRM_DEBUG_KMS("pipe %d plane %d init failed: %d\n",
+                                              i, j, ret);
+                }
         }
 
         intel_cpu_pll_init(dev);