On Wed, 27 Oct 2021, Matthew Auld <matthew.william.auld@xxxxxxxxx> wrote: > On Thu, 21 Oct 2021 at 13:54, Matthew Auld <matthew.auld@xxxxxxxxx> wrote: >> >> wbinvd_on_all_cpus() is only defined on x86 it seems, plus we need to >> include asm/smp.h here. >> >> Reported-by: kernel test robot <lkp@xxxxxxxxx> >> Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx> >> Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx> > > Jani, would it make sense to cherry-pick this to -fixes? The offending > commit is in drm-next, and there have been a few reports around this. > > Fixes: a035154da45d ("drm/i915/dmabuf: add paranoid flush-on-acquire") If the Fixes: tag is in place, our tooling will cherry-pick it where it belongs. (In this case, drm-intel-next-fixes, not drm-intel-fixes.) Cc: Rodrigo who covers drm-intel-next-fixes atm. BR, Jani. > > >> --- >> drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> index 1adcd8e02d29..a45d0ec2c5b6 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> @@ -12,6 +12,13 @@ >> #include "i915_gem_object.h" >> #include "i915_scatterlist.h" >> >> +#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) >> -- >> 2.26.3 >> -- Jani Nikula, Intel Open Source Graphics Center