[Intel-gfx] [PATCH 1/2] drm/i915: fix broken build

[Christian König]

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 at intel.com>
>>> Cc: Christian König <christian.koenig at amd.com>
>>> Cc: Daniel Vetter <daniel.vetter at 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 at 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)
>>