On Fri, Apr 23, 2021 at 05:31:12PM -0500, Jason Ekstrand wrote: > The idea behind this param is to support OpenCL drivers with relocations > because OpenCL reserves 0x0 for NULL and, if we placed memory there, it > would confuse CL kernels. It was originally sent out as part of a patch > series including libdrm [1] and Beignet [2] support. However, the > libdrm and Beignet patches never landed in their respective upstream > projects so this API has never been used. It's never been used in Mesa > or any other driver, either. > > Dropping this API allows us to delete a small bit of code. > > [1]: https://lists.freedesktop.org/archives/intel-gfx/2015-May/067030.html > [2]: https://lists.freedesktop.org/archives/intel-gfx/2015-May/067031.html > > Signed-off-by: Jason Ekstrand <jason@xxxxxxxxxxxxxx> Same thing about an igt making sure we reject these. Maybe an entire wash-up igt which validates all the new restrictions on get/setparam (including that after execbuf it's even more strict). -Daniel > --- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 16 ++-------------- > .../gpu/drm/i915/gem/i915_gem_context_types.h | 1 - > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 -------- > include/uapi/drm/i915_drm.h | 4 ++++ > 4 files changed, 6 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > index e52b85b8f923d..35bcdeddfbf3f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > @@ -1922,15 +1922,6 @@ static int ctx_setparam(struct drm_i915_file_private *fpriv, > int ret = 0; > > switch (args->param) { > - case I915_CONTEXT_PARAM_NO_ZEROMAP: > - if (args->size) > - ret = -EINVAL; > - else if (args->value) > - set_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > - else > - clear_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > - break; > - > case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: > if (args->size) > ret = -EINVAL; > @@ -1980,6 +1971,7 @@ static int ctx_setparam(struct drm_i915_file_private *fpriv, > ret = set_persistence(ctx, args); > break; > > + case I915_CONTEXT_PARAM_NO_ZEROMAP: > case I915_CONTEXT_PARAM_BAN_PERIOD: > case I915_CONTEXT_PARAM_RINGSIZE: > default: > @@ -2360,11 +2352,6 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, > return -ENOENT; > > switch (args->param) { > - case I915_CONTEXT_PARAM_NO_ZEROMAP: > - args->size = 0; > - args->value = test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > - break; > - > case I915_CONTEXT_PARAM_GTT_SIZE: > args->size = 0; > rcu_read_lock(); > @@ -2412,6 +2399,7 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, > args->value = i915_gem_context_is_persistent(ctx); > break; > > + case I915_CONTEXT_PARAM_NO_ZEROMAP: > case I915_CONTEXT_PARAM_BAN_PERIOD: > case I915_CONTEXT_PARAM_RINGSIZE: > default: > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > index 340473aa70de0..5ae71ec936f7c 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h > @@ -129,7 +129,6 @@ struct i915_gem_context { > * @user_flags: small set of booleans controlled by the user > */ > unsigned long user_flags; > -#define UCONTEXT_NO_ZEROMAP 0 > #define UCONTEXT_NO_ERROR_CAPTURE 1 > #define UCONTEXT_BANNABLE 2 > #define UCONTEXT_RECOVERABLE 3 > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 297143511f99b..b812f313422a9 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -290,7 +290,6 @@ struct i915_execbuffer { > struct intel_context *reloc_context; > > u64 invalid_flags; /** Set of execobj.flags that are invalid */ > - u32 context_flags; /** Set of execobj.flags to insert from the ctx */ > > u64 batch_len; /** Length of batch within object */ > u32 batch_start_offset; /** Location within object of batch */ > @@ -541,9 +540,6 @@ eb_validate_vma(struct i915_execbuffer *eb, > entry->flags |= EXEC_OBJECT_NEEDS_GTT | __EXEC_OBJECT_NEEDS_MAP; > } > > - if (!(entry->flags & EXEC_OBJECT_PINNED)) > - entry->flags |= eb->context_flags; > - > return 0; > } > > @@ -750,10 +746,6 @@ static int eb_select_context(struct i915_execbuffer *eb) > if (rcu_access_pointer(ctx->vm)) > eb->invalid_flags |= EXEC_OBJECT_NEEDS_GTT; > > - eb->context_flags = 0; > - if (test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags)) > - eb->context_flags |= __EXEC_OBJECT_NEEDS_BIAS; > - > return 0; > } > > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 6eefbc6dec01f..a0aaa8298f28d 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -1637,6 +1637,10 @@ struct drm_i915_gem_context_param { > __u32 size; > __u64 param; > #define I915_CONTEXT_PARAM_BAN_PERIOD 0x1 > +/* I915_CONTEXT_PARAM_NO_ZEROMAP has been removed. On the off chance > + * someone somewhere has attempted to use it, never re-use this context > + * param number. > + */ > #define I915_CONTEXT_PARAM_NO_ZEROMAP 0x2 > #define I915_CONTEXT_PARAM_GTT_SIZE 0x3 > #define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 > -- > 2.31.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
