diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-12-03 06:49:06 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-03 14:11:51 -0500 |
commit | 2a2d548240ff5f5bd826640bdf8baa016ab6cec4 (patch) | |
tree | 7de27b9637f0c1d7c5360c840fcdcac204579934 /drivers/gpu/drm/i915/i915_drv.h | |
parent | 4239ca779dbe47a310a3106d9f4cd5458014bdb6 (diff) |
drm/i915: Tighten the checks for invalid relocation domains
Be specific for the GPU domains so that we can detect if userspace ever
passed in an invalid combination, as well as accurately reflect the
known GPU domains when printing state.
Fixes i-g-t/gem_exec_bad_domains
References: https://bugs.freedesktop.org/show_bug.cgi?id=57826
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e2944e9bc750..3473298a137f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -83,7 +83,12 @@ enum port { | |||
83 | }; | 83 | }; |
84 | #define port_name(p) ((p) + 'A') | 84 | #define port_name(p) ((p) + 'A') |
85 | 85 | ||
86 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | 86 | #define I915_GEM_GPU_DOMAINS \ |
87 | (I915_GEM_DOMAIN_RENDER | \ | ||
88 | I915_GEM_DOMAIN_SAMPLER | \ | ||
89 | I915_GEM_DOMAIN_COMMAND | \ | ||
90 | I915_GEM_DOMAIN_INSTRUCTION | \ | ||
91 | I915_GEM_DOMAIN_VERTEX) | ||
87 | 92 | ||
88 | #define for_each_pipe(p) for ((p) = 0; (p) < dev_priv->num_pipe; (p)++) | 93 | #define for_each_pipe(p) for ((p) = 0; (p) < dev_priv->num_pipe; (p)++) |
89 | 94 | ||