From: Matthew Auld <matthew.auld@intel.com>
To: "Christian König" <christian.koenig@amd.com>,
intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Lucas De Marchi <lucas.demarchi@intel.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2] drm/i915: fix i915_gem_object_wait_moving_fence
Date: Fri, 8 Apr 2022 10:48:32 +0100 [thread overview]
Message-ID: <b9a31872-5f23-965f-784d-9ebb6c192e47@intel.com> (raw)
In-Reply-To: <c2827f30-989a-4d25-4cf5-e252a9ba32ea@amd.com>
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)
>
next prev parent reply other threads:[~2022-04-08 9:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 8:42 [PATCH v2] drm/i915: fix i915_gem_object_wait_moving_fence Matthew Auld
2022-04-08 8:59 ` Christian König
2022-04-08 9:48 ` Matthew Auld [this message]
2022-04-08 10:57 ` Matthew Auld
2022-04-08 9:23 ` [Intel-gfx] " Petri Latvala
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=b9a31872-5f23-965f-784d-9ebb6c192e47@intel.com \
--to=matthew.auld@intel.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lucas.demarchi@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;
as well as URLs for NNTP newsgroup(s).