diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-06-11 18:49:16 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-01-08 14:01:49 +0100 |
| commit | dd7839641f51618aad86327bcadaf7ebcea47fa5 (patch) | |
| tree | f49445093b4ece5cc7313984add8c122ed2b1efc | |
| parent | 88e56219dd3066b199fdf9db04d99b8cdf31cdd9 (diff) | |
drm/i915: Dont clear __EXEC_HAS_RELOC twice
This was added in
commit c43ce12328df0770ce899feabdf9c430c54c766a
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Wed Aug 19 16:08:48 2020 +0200
drm/i915: Use per object locking in execbuf, v12.
but even back then the caller of eb_relocate_parse() was clearing this
flag already too.
This is still the case, so just remove the duplicated clearing.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jon Bloomfield <jon.bloomfield@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 7bd8df9321d0..bc6b5eec3f31 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1954,18 +1954,7 @@ err: return err; slow: - err = eb_relocate_parse_slow(eb); - if (err) - /* - * If the user expects the execobject.offset and - * reloc.presumed_offset to be an exact match, - * as for using NO_RELOC, then we cannot update - * the execobject.offset until we have completed - * relocation. - */ - eb->args->flags &= ~__EXEC_HAS_RELOC; - - return err; + return eb_relocate_parse_slow(eb); } /* |