| From b63204214b602f8ae8373aaac21b68178caa1eb5 Mon Sep 17 00:00:00 2001 |
| From: "Xiang, Haihao" <haihao.xiang@intel.com> |
| Date: Tue, 28 May 2013 19:22:34 -0700 |
| Subject: drm/i915: add I915_PARAM_HAS_VEBOX to i915_getparam |
| |
| This will let userland only try to use the new ring |
| when the appropriate kernel is present |
| |
| Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> |
| 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 a1f2cc73c762868435ae6ec9126bb2240337c61c) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_dma.c | 3 +++ |
| include/uapi/drm/i915_drm.h | 2 +- |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_dma.c |
| +++ b/drivers/gpu/drm/i915/i915_dma.c |
| @@ -963,6 +963,9 @@ static int i915_getparam(struct drm_devi |
| case I915_PARAM_HAS_BLT: |
| value = intel_ring_initialized(&dev_priv->ring[BCS]); |
| break; |
| + case I915_PARAM_HAS_VEBOX: |
| + value = intel_ring_initialized(&dev_priv->ring[VECS]); |
| + break; |
| case I915_PARAM_HAS_RELAXED_FENCING: |
| value = 1; |
| break; |
| --- a/include/uapi/drm/i915_drm.h |
| +++ b/include/uapi/drm/i915_drm.h |
| @@ -305,7 +305,7 @@ typedef struct drm_i915_irq_wait { |
| #define I915_PARAM_HAS_WAIT_TIMEOUT 19 |
| #define I915_PARAM_HAS_SEMAPHORES 20 |
| #define I915_PARAM_HAS_PRIME_VMAP_FLUSH 21 |
| -#define I915_PARAM_RSVD_FOR_FUTURE_USE 22 |
| +#define I915_PARAM_HAS_VEBOX 22 |
| #define I915_PARAM_HAS_SECURE_BATCHES 23 |
| #define I915_PARAM_HAS_PINNED_BATCHES 24 |
| #define I915_PARAM_HAS_EXEC_NO_RELOC 25 |
