| From 8b47e7d28bf88e4bedf76827a06aad825b94f91f Mon Sep 17 00:00:00 2001 |
| From: Ben Widawsky <ben@bwidawsk.net> |
| Date: Tue, 28 May 2013 19:22:19 -0700 |
| Subject: drm/i915: Introduce VECS: the 4th ring |
| |
| The video enhancement command streamer is a new ring on HSW which does |
| what it sounds like it does. This patch provides the most minimal |
| inception of the ring. |
| |
| In order to support a new ring, we need to bump the number. The patch |
| may look trivial to the untrained eye, but bumping the number of rings |
| is a bit scary. As such the patch is not terribly useful by itself, but |
| a pretty nice place to find issues during a bisection. |
| |
| Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> |
| Signed-off-by: Ben Widawsky <ben@bwidawsk.net> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 4a3dd19d94c65323d71b2ffc7e63940f00acfb47) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++ |
| drivers/gpu/drm/i915/intel_ringbuffer.h | 3 ++- |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_ringbuffer.c |
| +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c |
| @@ -920,6 +920,8 @@ void intel_ring_setup_status_page(struct |
| case VCS: |
| mmio = BSD_HWS_PGA_GEN7; |
| break; |
| + case VECS: |
| + BUG(); |
| } |
| } else if (IS_GEN6(ring->dev)) { |
| mmio = RING_HWS_PGA_GEN6(ring->mmio_base); |
| --- a/drivers/gpu/drm/i915/intel_ringbuffer.h |
| +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h |
| @@ -47,8 +47,9 @@ struct intel_ring_buffer { |
| RCS = 0x0, |
| VCS, |
| BCS, |
| + VECS, |
| } id; |
| -#define I915_NUM_RINGS 3 |
| +#define I915_NUM_RINGS 4 |
| u32 mmio_base; |
| void __iomem *virtual_start; |
| struct drm_device *dev; |
