From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx <intel-gfx@lists.freedesktop.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
DRI <dri-devel@lists.freedesktop.org>,
Dave Airlie <airlied@linux.ie>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] drm/i915: Fix docbook descriptions for i915_cmd_parser
Date: Fri, 23 Apr 2021 12:42:45 +0200 [thread overview]
Message-ID: <20c93c9a-9aca-0057-23bf-463e7946e1c8@linux.intel.com> (raw)
In-Reply-To: <YIExRAHQvZmgL5S+@phenom.ffwll.local>
Op 22-04-2021 om 10:18 schreef Daniel Vetter:
> On Wed, Apr 21, 2021 at 04:39:10PM +0200, Maarten Lankhorst wrote:
>> Op 21-04-2021 om 16:32 schreef Daniel Vetter:
>>> On Wed, Apr 21, 2021 at 2:03 PM Maarten Lankhorst
>>> <maarten.lankhorst@linux.intel.com> wrote:
>>>> Fixes the following htmldocs warnings:
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c:1420: warning: Excess function parameter 'trampoline' description in 'intel_engine_cmd_parser'
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c:1420: warning: Function parameter or member 'jump_whitelist' not described in 'intel_engine_cmd_parser'
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c:1420: warning: Function parameter or member 'shadow_map' not described in 'intel_engine_cmd_parser'
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c:1420: warning: Function parameter or member 'batch_map' not described in 'intel_engine_cmd_parser'
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c:1420: warning: Excess function parameter 'trampoline' description in 'intel_engine_cmd_parser'
>>>>
>>>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>>>> ---
>>>> drivers/gpu/drm/i915/i915_cmd_parser.c | 16 +++++++++++++++-
>>>> 1 file changed, 15 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
>>>> index e6f1e93abbbb..afb9b7516999 100644
>>>> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
>>>> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
>>>> @@ -1369,6 +1369,18 @@ static int check_bbstart(u32 *cmd, u32 offset, u32 length,
>>>> return 0;
>>>> }
>>>>
>>>> +/**
>>>> + * intel_engine_cmd_parser_alloc_jump_whitelist() - preallocate jump whitelist for intel_engine_cmd_parser()
>>>> + * @batch_length: length of the commands in batch_obj
>>>> + * @trampoline: Whether jump trampolines are used.
>>>> + *
>>>> + * Preallocates a jump whitelist for parsing the cmd buffer in intel_engine_cmd_parser().
>>>> + * This has to be preallocated, because the command parser runs in signaling context,
>>>> + * and may not allocate any memory.
>>>> + *
>>>> + * Return: NULL or pointer to a jump whitelist, or ERR_PTR() on failure. Use
>>>> + * IS_ERR() to check for errors. Must bre freed() with kfree().
>>> IS_ERR_OR_NULL or needs an actual bugfix in the code since we're not
>>> consistent. Also s/bre/be/
>> We're sort of consistent, NULL is a valid return code. IS_ERR is only on faliure. :)
> Maybe explain that and then Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Cheers, Daniel
>
>>> -Daniel
>>>
>>>> + */
>>>> unsigned long *intel_engine_cmd_parser_alloc_jump_whitelist(u32 batch_length,
>>>> bool trampoline)
>>>> {
>>>> @@ -1401,7 +1413,9 @@ unsigned long *intel_engine_cmd_parser_alloc_jump_whitelist(u32 batch_length,
>>>> * @batch_offset: byte offset in the batch at which execution starts
>>>> * @batch_length: length of the commands in batch_obj
>>>> * @shadow: validated copy of the batch buffer in question
>>>> - * @trampoline: whether to emit a conditional trampoline at the end of the batch
>>>> + * @jump_whitelist: buffer preallocated with intel_engine_cmd_parser_alloc_jump_whitelist()
>>>> + * @shadow_map: mapping to @shadow vma
>>>> + * @batch_map: mapping to @batch vma
>>>> *
>>>> * Parses the specified batch buffer looking for privilege violations as
>>>> * described in the overview.
>>>> --
>>>> 2.31.0
>>>>
Updated and pushed both, thanks. :)
prev parent reply other threads:[~2021-04-23 10:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 12:03 [PATCH] drm/i915: Fix docbook descriptions for i915_cmd_parser Maarten Lankhorst
2021-04-21 14:32 ` Daniel Vetter
2021-04-21 14:39 ` Maarten Lankhorst
2021-04-22 8:18 ` Daniel Vetter
2021-04-23 10:42 ` Maarten Lankhorst [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20c93c9a-9aca-0057-23bf-463e7946e1c8@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).