From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Dave Airlie <airlied@redhat.com>,
intel-gfx@lists.freedesktop.org,
Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix slightly botched merge in __reloc_entry_gpu
Date: Thu, 10 Sep 2020 14:27:58 +0300 [thread overview]
Message-ID: <20200910112758.GW6112@intel.com> (raw)
In-Reply-To: <20200910111225.2184193-1-maarten.lankhorst@linux.intel.com>
On Thu, Sep 10, 2020 at 01:12:25PM +0200, Maarten Lankhorst wrote:
> This function should be an int, not a bool.
>
> Presumably because we had the same 2 reverts in a slightly different
> way, git got confused.
>
> Thanks to Dan for reporting. :)
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: Dave Airlie <airlied@redhat.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 804339255df1..5509946f1a1d 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -1437,7 +1437,7 @@ static unsigned long vma_phys_addr(struct i915_vma *vma, u32 offset)
> return addr + offset_in_page(offset);
> }
>
> -static bool __reloc_entry_gpu(struct i915_execbuffer *eb,
> +static int __reloc_entry_gpu(struct i915_execbuffer *eb,
> struct i915_vma *vma,
> u64 offset,
> u64 target_addr)
> @@ -1456,7 +1456,7 @@ static bool __reloc_entry_gpu(struct i915_execbuffer *eb,
>
> batch = reloc_gpu(eb, vma, len);
> if (batch == ERR_PTR(-EDEADLK))
> - return (s64)-EDEADLK;
> + return -EDEADLK;
> else if (IS_ERR(batch))
> return false;
If it's an int now why is there a 'false' still here?
>
>
> base-commit: 877d8c074302c20ac0759d1a4f689c14aada420d
> --
> 2.28.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-09-10 11:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 11:12 [Intel-gfx] [PATCH] drm/i915: Fix slightly botched merge in __reloc_entry_gpu Maarten Lankhorst
2020-09-10 11:27 ` Ville Syrjälä [this message]
2020-09-10 12:04 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-09-10 12:28 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-10 14:12 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=20200910112758.GW6112@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/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