| Message ID | 20211027205302.19222-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] i915/gem/dmabuf: add <asm/smp.h> to fix build error | expand |
On 10/27/21 2:27 PM, Patchwork wrote: > == Series Details == > > Series: i915/gem/dmabuf: add <asm/smp.h> to fix build error > URL : https://patchwork.freedesktop.org/series/96360/ > State : failure > > == Summary == > > Applying: i915/gem/dmabuf: add <asm/smp.h> to fix build error > error: sha1 information is lacking or useless (drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c). > error: could not build fake ancestor > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0001 i915/gem/dmabuf: add <asm/smp.h> to fix build error > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". Hi Patchwork, I am not using git, therefore there is no ancestor information. This patch applies to linux-next-20211027 (today where I am). Can I just say sha1: ae5179317e79 from: commit ae5179317e79 (HEAD, tag: next-20211027, origin/master, origin/HEAD) Author: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed Oct 27 21:40:16 2021 +1100 Add linux-next specific files for 20211027 Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Where is the format of the sha1: documented? I will gladly just report this build error and let someone else fix it. Good day.
--- linux-next-20211027.orig/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ linux-next-20211027/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -8,6 +8,7 @@ #include <linux/highmem.h> #include <linux/dma-resv.h> #include <linux/module.h> +#include <asm/smp.h> #include "i915_drv.h" #include "i915_gem_object.h"
When CONFIG_SMP is not set, wbinvd_on_all_cpus() is not declared, due to missing <asm/smp.h>. Fixes this build error: ../drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c: In function 'i915_gem_object_get_pages_dmabuf': ../drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c:251:3: error: implicit declaration of function 'wbinvd_on_all_cpus'; did you mean 'wrmsr_on_cpus'? [-Werror=implicit-function-declaration] wbinvd_on_all_cpus(); Fixes: a035154da45d ("drm/i915/dmabuf: add paranoid flush-on-acquire") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> To: Jani Nikula <jani.nikula@linux.intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 1 + 1 file changed, 1 insertion(+)