drm/i915: fix i915_gem_object_wait_moving_fence
authorMatthew Auld <matthew.auld@intel.com>
Fri, 8 Apr 2022 08:42:05 +0000 (09:42 +0100)
committerChristian König <christian.koenig@amd.com>
Fri, 8 Apr 2022 10:59:36 +0000 (12:59 +0200)
commit9362a07a0c5d6e566d614e988bc9c96102774a9d
tree926672db3570f61720f443db3a15dd36dc6aa845
parentc9cad937c0c58618fe5b0310fd539a854dc1ae95
drm/i915: fix i915_gem_object_wait_moving_fence

All of CI is just failing with the following, which prevents loading of
the module:

    i915 0000:03:00.0: [drm] *ERROR* Scratch setup failed

Best guess is that this comes from the pin_map() for the scratch page,
which does an i915_gem_object_wait_moving_fence() somewhere. It looks
like this now calls into dma_resv_wait_timeout() which can return the
remaining timeout, leading to the caller thinking this is an error.

v2(Lucas): handle ret == 0

Fixes: 1d7f5e6c5240 ("drm/i915: drop bo->moving dependency")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Christian König <christian.koenig@amd.com> #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20220408084205.1353427-1-matthew.auld@intel.com
Signed-off-by: Christian König <christian.koenig@amd.com>
drivers/gpu/drm/i915/gem/i915_gem_object.c