drm/i915: Make num_sprites a per-pipe value

In the future, we need to be able to specify per-pipe number of
planes/sprites. Let's start today!

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f8f7a59ab076..e4d2b9f15ae2 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1480,12 +1480,16 @@ static void intel_device_info_runtime_init(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_device_info *info;
+        enum pipe pipe;
 
         info = (struct intel_device_info *)&dev_priv->info;
 
-        info->num_sprites = 1;
         if (IS_VALLEYVIEW(dev))
-                info->num_sprites = 2;
+                for_each_pipe(pipe)
+                        info->num_sprites[pipe] = 2;
+        else
+                for_each_pipe(pipe)
+                        info->num_sprites[pipe] = 1;
 
         if (i915.disable_display) {
                 DRM_INFO("Display disabled (module parameter)\n");