On Sat, Apr 27, 2013 at 05:59:29PM -0700, Ben Widawsky wrote:
> From: "Xiang, Haihao" <haihao.xiang at intel.com>
>
> This will let userland only try to use the new ring
> when the appropriate kernel is present
>
> Signed-off-by: Xiang, Haihao <haihao.xiang at intel.com>
> [Order changed, and merge conflict resolved by]
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>
--
Damien
> ---
> drivers/gpu/drm/i915/i915_dma.c | 3 +++
> include/uapi/drm/i915_drm.h | 2 +-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index a1648eb..66a1e39 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -956,6 +956,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
> 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;
> diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
> index 81b9981..923ed7f 100644
> --- 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
> --
> 1.8.2.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
