From: Tvrtko Ursulin Date: Mon, 22 Nov 2021 12:18:15 +0000 (+0000) Subject: Merge drm/drm-next into drm-intel-gt-next X-Git-Tag: v5.17-rc1~173^2~14^2~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8626afb170dc44ed0512e04131e4d8eac0c5ec57;p=thirdparty%2Fkernel%2Flinux.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 --- 8626afb170dc44ed0512e04131e4d8eac0c5ec57 diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index a2b485a1be8c7,e8a58c9971703..f291cf4c38860 --- 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 +#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)