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@xxxxxxxxxxxxxxx> > Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > Cc: Dave Airlie <airlied@xxxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
