From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Mon, 22 Nov 2021 12:18:15 +0000 (+0000)
Subject: Merge drm/drm-next into drm-intel-gt-next
X-Git-Tag: v6.6.17~3937^2~16^2~1234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8626afb170dc44ed0512e04131e4d8eac0c5ec57;p=platform%2Fkernel%2Flinux-rpi.git

Merge drm/drm-next into drm-intel-gt-next

Thomas needs the dma_resv_for_each_fence API for i915/ttm async migration
work.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---

8626afb170dc44ed0512e04131e4d8eac0c5ec57
diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
index a2b485a,e8a58c9..f291cf4
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@@ -12,13 -15,8 +15,15 @@@
  #include "i915_gem_object.h"
  #include "i915_scatterlist.h"
  
+ MODULE_IMPORT_NS(DMA_BUF);
+ 
 +#if defined(CONFIG_X86)
 +#include <asm/smp.h>
 +#else
 +#define wbinvd_on_all_cpus() \
 +	pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
 +#endif
 +
  I915_SELFTEST_DECLARE(static bool force_different_devices;)
  
  static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf)