dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: "Mateusz Jończyk" <mat.jonczyk@o2.pl>,
	"Hans de Goede" <hdegoede@redhat.com>,
	dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Use i915_gem_object_ggtt_pin_ww for reloc_iomap
Date: Wed, 11 May 2022 20:38:23 +0200	[thread overview]
Message-ID: <66e2bfe6-6053-9728-63ee-e4aad5a0f631@linux.intel.com> (raw)
In-Reply-To: <3dbe7c30-dfef-0cde-b9cb-2ffdcb460113@intel.com>

Op 11-05-2022 om 20:23 schreef Matthew Auld:
> On 11/05/2022 12:52, Maarten Lankhorst wrote:
>> Instead of its own path, use the common path when it doesn't result
>> in evicting any vma. This fixes the case where we don't wait for
>> binding.
>>
>
> https://gitlab.freedesktop.org/drm/intel/-/issues/5806
>
> If I'm reading that correctly waiting for the bind doesn't seem to help?

I suspect the actual pinning there might do some stuff that we are not doing.

It was working before the change, and manually calling pin caused the failure, so I reverted it back to what was working before. It was specifically the manual pin code that was failing.

I can change the commit message if it helps.

~Maarten

>> Fixes: b5cfe6f7a6e1 ("drm/i915: Remove short-term pins from execbuf, v6.")
>> Cc: Matthew Auld <matthew.auld@intel.com>
>> Reported-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
>> Tested-by: Hans de Goede <hdegoede@redhat.com>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>   drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 ++----
>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> index 498b458fd784..919d01082909 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> @@ -1262,14 +1262,12 @@ static void *reloc_iomap(struct i915_vma *batch,
>>            * Only attempt to pin the batch buffer to ggtt if the current batch
>>            * is not inside ggtt, or the batch buffer is not misplaced.
>>            */
>> -        if (!i915_is_ggtt(batch->vm)) {
>> +        if (!i915_is_ggtt(batch->vm) ||
>> +            !i915_vma_misplaced(batch, 0, 0, PIN_MAPPABLE)) {
>>               vma = i915_gem_object_ggtt_pin_ww(obj, &eb->ww, NULL, 0, 0,
>>                                 PIN_MAPPABLE |
>>                                 PIN_NONBLOCK /* NOWARN */ |
>>                                 PIN_NOEVICT);
>> -        } else if (i915_vma_is_map_and_fenceable(batch)) {
>> -            __i915_vma_pin(batch);
>> -            vma = batch;
>>           }
>>             if (vma == ERR_PTR(-EDEADLK))



  reply	other threads:[~2022-05-11 18:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11 11:52 Maarten Lankhorst
2022-05-11 18:23 ` Matthew Auld
2022-05-11 18:38   ` Maarten Lankhorst [this message]
2022-05-12 16:14     ` Matthew Auld

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=66e2bfe6-6053-9728-63ee-e4aad5a0f631@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hdegoede@redhat.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=mat.jonczyk@o2.pl \
    --cc=matthew.auld@intel.com \
    --subject='Re: [PATCH] drm/i915: Use i915_gem_object_ggtt_pin_ww for reloc_iomap' \
    /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

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).