From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF73AC433B4 for ; Tue, 27 Apr 2021 09:38:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2293C613B4 for ; Tue, 27 Apr 2021 09:38:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2293C613B4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EF916E04B; Tue, 27 Apr 2021 09:38:45 +0000 (UTC) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 608096E05F for ; Tue, 27 Apr 2021 09:38:43 +0000 (UTC) Received: by mail-wr1-x42f.google.com with SMTP id x7so58712561wrw.10 for ; Tue, 27 Apr 2021 02:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=BZsEoeG49lcEgxHVjfAaPo7gvA8KaWPd6I8uo7fZPvg=; b=PJj+5l5dLforslyu9VwtYI/6YmzDhZQ2+qmcOHnj0baIY884i57zNYWzjbgwTbJEGj dYuDvI6ffnM2FLGw6GUc8GQTx3+QdFaf0Yz3u1aWFDcr8B+DS9OwlnYRdzuSm2+6fM1x NeY4wGhg51RJYKKjWB6u2QV9AgBqG9ilGKi7Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BZsEoeG49lcEgxHVjfAaPo7gvA8KaWPd6I8uo7fZPvg=; b=BfGZmbEJJjW8KqBpUZTTgxBITMrpw+kwtTUTNsTFsf7ExNDwiTcNtsZmbKuNbm86hy P9vgSukeeidDt6jdy2HbpjLmbADf2hIXXbR2eeNqt1vZcik4lwb3ZP4fk3aNLV6zgnk9 qdY/sO5g2KBPQqcU2fhbfkAc3TJd39d2mjYUPen1tnf1e0zA4JnbzLSh6OOPkr20uvI5 mp/4DDshWTBOUQMfSHJ4nEuwLH+M3r4a2oKL6zuojn92dz/hMlcA3AoTEZIPc0bWkFwh kwM2KQrK74LIy/FmGrP6AMfBjEwC4MuU/cbZqbwJlkbitpWlzlz9PDIulqRVCRnspzUG c9GA== X-Gm-Message-State: AOAM530W0VhZ8+cZqmJe6vqygKOmXBlP0a8enZou4KzC0g32Buy4gQrC +y5jnYze19zjQnc0rJfxAfS9GA== X-Google-Smtp-Source: ABdhPJxWNyS8LJJ/h4D3xDYGKU2S8uLFndFtIlSf7B4CivBTD6liIMxLm0OBTNLO9WDcGUWFUwEM4Q== X-Received: by 2002:a5d:58e1:: with SMTP id f1mr2814524wrd.375.1619516322161; Tue, 27 Apr 2021 02:38:42 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id j7sm6890605wmi.21.2021.04.27.02.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 02:38:41 -0700 (PDT) Date: Tue, 27 Apr 2021 11:38:40 +0200 From: Daniel Vetter To: Jason Ekstrand Subject: Re: [Intel-gfx] [PATCH 02/21] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Message-ID: References: <20210423223131.879208-1-jason@jlekstrand.net> <20210423223131.879208-3-jason@jlekstrand.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210423223131.879208-3-jason@jlekstrand.net> X-Operating-System: Linux phenom 5.10.32scarlett+ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 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@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel