diff options
| author | Damien Lespiau | 2014-03-03 18:31:48 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-05 21:30:38 +0100 |
| commit | d615a16622745d8e4c1104d5ca46c058ef576b7a (patch) | |
| tree | eaa37582f8209527bcac9cd08c9cca95ea1f2ad1 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | drm/i915: Add a for_each_sprite() macro (diff) | |
| download | kernel-qcow2-linux-d615a16622745d8e4c1104d5ca46c058ef576b7a.tar.gz kernel-qcow2-linux-d615a16622745d8e4c1104d5ca46c058ef576b7a.tar.xz kernel-qcow2-linux-d615a16622745d8e4c1104d5ca46c058ef576b7a.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 8 |
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"); |