| Message ID | 20220408084205.1353427-1-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915: fix i915_gem_object_wait_moving_fence | expand |
Am 08.04.22 um 10:42 schrieb Matthew Auld: > 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 Reviewed-by: Christian König <christian.koenig@amd.com> Should I push it to drm-misc-next? > --- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c > index 2998d895a6b3..747ac65e060f 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -772,9 +772,16 @@ int i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj, > int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, > bool intr) > { > + long ret; > + > assert_object_held(obj); > - return dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, > - intr, MAX_SCHEDULE_TIMEOUT); > + > + ret = dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, > + intr, MAX_SCHEDULE_TIMEOUT); > + if (!ret) > + ret = -ETIME; > + > + return ret < 0 ? ret : 0; > } > > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
On Fri, Apr 08, 2022 at 09:42:05AM +0100, Matthew Auld wrote: > 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 For the record, patchwork is disabled at this time. Trybot is still up if you want CI to verify this.
On 08/04/2022 09:59, Christian König wrote: > Am 08.04.22 um 10:42 schrieb Matthew Auld: >> 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 > > Reviewed-by: Christian König <christian.koenig@amd.com> > > Should I push it to drm-misc-next? I guess we need to wait for at least BAT result to come back. I will ping here, assuming that comes back green. Thanks. > >> --- >> drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +++++++++-- >> 1 file changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c >> b/drivers/gpu/drm/i915/gem/i915_gem_object.c >> index 2998d895a6b3..747ac65e060f 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c >> @@ -772,9 +772,16 @@ int i915_gem_object_get_moving_fence(struct >> drm_i915_gem_object *obj, >> int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, >> bool intr) >> { >> + long ret; >> + >> assert_object_held(obj); >> - return dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, >> - intr, MAX_SCHEDULE_TIMEOUT); >> + >> + ret = dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, >> + intr, MAX_SCHEDULE_TIMEOUT); >> + if (!ret) >> + ret = -ETIME; >> + >> + return ret < 0 ? ret : 0; >> } >> #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) >
On 08/04/2022 10:48, Matthew Auld wrote: > On 08/04/2022 09:59, Christian König wrote: >> Am 08.04.22 um 10:42 schrieb Matthew Auld: >>> 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 >> >> Reviewed-by: Christian König <christian.koenig@amd.com> >> >> Should I push it to drm-misc-next? > > I guess we need to wait for at least BAT result to come back. I will > ping here, assuming that comes back green. Thanks. Ok, please go ahead with merging. > >> >>> --- >>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +++++++++-- >>> 1 file changed, 9 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c >>> b/drivers/gpu/drm/i915/gem/i915_gem_object.c >>> index 2998d895a6b3..747ac65e060f 100644 >>> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c >>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c >>> @@ -772,9 +772,16 @@ int i915_gem_object_get_moving_fence(struct >>> drm_i915_gem_object *obj, >>> int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, >>> bool intr) >>> { >>> + long ret; >>> + >>> assert_object_held(obj); >>> - return dma_resv_wait_timeout(obj->base. resv, >>> DMA_RESV_USAGE_KERNEL, >>> - intr, MAX_SCHEDULE_TIMEOUT); >>> + >>> + ret = dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, >>> + intr, MAX_SCHEDULE_TIMEOUT); >>> + if (!ret) >>> + ret = -ETIME; >>> + >>> + return ret < 0 ? ret : 0; >>> } >>> #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) >>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 2998d895a6b3..747ac65e060f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -772,9 +772,16 @@ int i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj, int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, bool intr) { + long ret; + assert_object_held(obj); - return dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, - intr, MAX_SCHEDULE_TIMEOUT); + + ret = dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, + intr, MAX_SCHEDULE_TIMEOUT); + if (!ret) + ret = -ETIME; + + return ret < 0 ? ret : 0; } #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
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 --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)