Merge tag 'v3.7-rc2' into drm-intel-next-queued

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_dma.c

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index c9bfd83..d04facb 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1014,6 +1014,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
        case I915_PARAM_HAS_PRIME_VMAP_FLUSH:
                value = 1;
                break;
+       case I915_PARAM_HAS_SECURE_BATCHES:
+               value = capable(CAP_SYS_ADMIN);
+               break;
        default:
                DRM_DEBUG_DRIVER("Unknown parameter %d\n",
                                 param->param);