drm/i915: Make num_sprites a per-pipe value
authorDamien Lespiau <damien.lespiau@intel.com>
Mon, 3 Mar 2014 17:31:48 +0000 (17:31 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 5 Mar 2014 20:30:38 +0000 (21:30 +0100)
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>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h

Simple merge
Simple merge