Re: [PATCH 1/2] drm/i915: fix broken build

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
Cc: Christian König <christian.koenig@xxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>

My best guess is that this is a rebase/merge conflict. I'm 100% sure i915 was compiling fine before I pushed the patch.

That was my thinking also, but building drm-misc-next I get the same error:

drivers/gpu/drm/i915/i915_deps.c: In function ‘i915_deps_add_resv’:
drivers/gpu/drm/i915/i915_deps.c:229:46: error: implicit conversion from ‘enum <anonymous>’ to ‘enum dma_resv_usage’ [-Werror=enum-conversion]
  229 |         dma_resv_for_each_fence(&iter, resv, true, fence) {
      |                                              ^~~~
./include/linux/dma-resv.h:297:47: note: in definition of macro ‘dma_resv_for_each_fence’
  297 |         for (dma_resv_iter_begin(cursor, obj, usage),   \
      |                                               ^~~~~


Anyway Reviewed-by: Christian König <christian.koenig@xxxxxxx> for the series.

Thanks.


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)




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux