]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "drm/i915/dmabuf: fix broken build"
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 22 Nov 2021 13:57:58 +0000 (13:57 +0000)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Wed, 24 Nov 2021 09:22:53 +0000 (09:22 +0000)
This reverts commit bf6d9de0b16c ("drm/i915/dmabuf: fix broken build").

Approach taken in the patch was rejected by Linus and the upstream tree
now already contains the required include directive via 191fb5bbb77a
("Merge tag 'drm-next-2021-11-12' of git://anongit.freedesktop.org/drm/drm").

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: bf6d9de0b16c ("drm/i915/dmabuf: fix broken build")
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211122135758.85444-1-tvrtko.ursulin@linux.intel.com
[tursulin: fixup commit message sha format]

drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c

index f291cf4c38860d5e2f7e2c8193006b7cc1ebe18e..1b526039a60dc75402c6f3b121d036e86c8c86f2 100644 (file)
 
 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)