From: "Christian König" <christian.koenig@amd.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: fix broken build
Date: Fri, 8 Apr 2022 10:45:18 +0200 [thread overview]
Message-ID: <e94fbeb3-ad18-9741-628b-9b3b34bfb738@amd.com> (raw)
In-Reply-To: <f5862ea0-908e-def3-df79-db3d06bc389e@intel.com>
Am 08.04.22 um 10:32 schrieb Matthew Auld:
> On 07/04/2022 17:49, Christian König wrote:
>> Am 07.04.22 um 18:45 schrieb Matthew Auld:
>>> I guess this was missed in the conversion or something.
>>>
>>> Fixes: 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
>>> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
>>> Cc: Christian König <christian.koenig@amd.com>
>>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> My best guess is that this is a rebase/merge conflict. I'm 100% sure
>> i915 was compiling fine before I pushed the patch.
>>
>> Anyway Reviewed-by: Christian König <christian.koenig@amd.com> for
>> the series.
>
> Christian, could you merge the first patch? I need to re-spin the
> second patch it seems.
Pushed.
Christian.
>
>>
>> Thanks,
>> Christian.
>>
>>> ---
>>> drivers/gpu/drm/i915/i915_deps.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_deps.c
>>> b/drivers/gpu/drm/i915/i915_deps.c
>>> index 999210b37325..297b8e4e42ee 100644
>>> --- a/drivers/gpu/drm/i915/i915_deps.c
>>> +++ b/drivers/gpu/drm/i915/i915_deps.c
>>> @@ -226,7 +226,7 @@ int i915_deps_add_resv(struct i915_deps *deps,
>>> struct dma_resv *resv,
>>> struct dma_fence *fence;
>>> dma_resv_assert_held(resv);
>>> - dma_resv_for_each_fence(&iter, resv, true, fence) {
>>> + dma_resv_for_each_fence(&iter, resv, dma_resv_usage_rw(true),
>>> fence) {
>>> int ret = i915_deps_add_dependency(deps, fence, ctx);
>>> if (ret)
>>
prev parent reply other threads:[~2022-04-08 8:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 16:45 [PATCH 1/2] drm/i915: fix broken build Matthew Auld
2022-04-07 16:45 ` [PATCH 2/2] drm/i915: fix i915_gem_object_wait_moving_fence Matthew Auld
2022-04-08 1:44 ` [Intel-gfx] " Lucas De Marchi
2022-04-08 5:00 ` Lucas De Marchi
2022-04-08 8:13 ` Matthew Auld
2022-04-08 9:08 ` Tvrtko Ursulin
2022-04-08 9:12 ` Christian König
2022-04-08 9:23 ` Tvrtko Ursulin
2022-04-08 9:29 ` Christian König
2022-04-07 16:49 ` [PATCH 1/2] drm/i915: fix broken build Christian König
2022-04-07 17:07 ` Matthew Auld
2022-04-08 8:32 ` Matthew Auld
2022-04-08 8:45 ` Christian König [this message]
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=e94fbeb3-ad18-9741-628b-9b3b34bfb738@amd.com \
--to=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@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).