From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Matthew Auld <matthew.auld@intel.com>, "Vivi, Rodrigo" <rodrigo.vivi@intel.com>, "jani.nikula@linux.intel.com" <jani.nikula@linux.intel.com>, "matthew.william.auld@gmail.com" <matthew.william.auld@gmail.com> Cc: "thomas.hellstrom@linux.intel.com" <thomas.hellstrom@linux.intel.com>, lkp <lkp@intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>, "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org> Subject: Re: [PATCH 1/2] drm/i915/dmabuf: fix broken build Date: Mon, 22 Nov 2021 13:34:08 +0000 [thread overview] Message-ID: <b5063e9f-5f25-e420-4b54-d88152830ef3@linux.intel.com> (raw) In-Reply-To: <82fb9cbc-915d-11d9-849f-f49e23edd29c@intel.com> On 28/10/2021 09:48, Matthew Auld wrote: > On 28/10/2021 02:43, Vivi, Rodrigo wrote: >> On Wed, 2021-10-27 at 10:48 +0100, Matthew Auld wrote: >>> On Wed, 27 Oct 2021 at 10:44, Jani Nikula >>> <jani.nikula@linux.intel.com> wrote: >>>> >>>> On Wed, 27 Oct 2021, Matthew Auld <matthew.william.auld@gmail.com> >>>> wrote: >>>>> On Wed, 27 Oct 2021 at 09:58, Jani Nikula >>>>> <jani.nikula@linux.intel.com> wrote: >>>>>> >>>>>> On Wed, 27 Oct 2021, Matthew Auld >>>>>> <matthew.william.auld@gmail.com> wrote: >>>>>>> On Thu, 21 Oct 2021 at 13:54, Matthew Auld >>>>>>> <matthew.auld@intel.com> 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@intel.com> >>>>>>>> Signed-off-by: Matthew Auld <matthew.auld@intel.com> >>>>>>>> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> >>>>>>> >>>>>>> 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.) >>>>> >>>>> Yeah, I forgot to add the fixes tag here unfortunately. >>>> >>>> Already merged? What's the commit id to be cherry-picked? Rodrigo >>>> can do >>>> it manually. >>> >>> Yeah, it was merged to gt-next: >>> >>> 777226dac058 ("drm/i915/dmabuf: fix broken build") >> >> picked up to drm-intel-next-fixes > > Thanks. Hmm it looks like we have this in -fixes (and in -gt) while Linus has explicitly thrown it out (see https://lists.freedesktop.org/archives/dri-devel/2021-November/330928.html). End result is that now we have a different Kernel Test Robot warning ("asm/smp.h is included more than once."). So we need to fish out "drm/i915/dmabuf: fix broken build" out from fixes with a revert or what? Regards, Tvrtko > >> >> thanks, >> Rodrigo. >> >>> >>>> >>>> Note to self, we should set up some way to check which maintainer >>>> is >>>> responsible for which branches and when. >>>> >>>> BR, >>>> Jani. >>>> >>>>> >>>>>> >>>>>> 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 >>>> >>>> -- >>>> Jani Nikula, Intel Open Source Graphics Center >>
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: Matthew Auld <matthew.auld@intel.com>, "Vivi, Rodrigo" <rodrigo.vivi@intel.com>, "jani.nikula@linux.intel.com" <jani.nikula@linux.intel.com>, "matthew.william.auld@gmail.com" <matthew.william.auld@gmail.com> Cc: "thomas.hellstrom@linux.intel.com" <thomas.hellstrom@linux.intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>, "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmabuf: fix broken build Date: Mon, 22 Nov 2021 13:34:08 +0000 [thread overview] Message-ID: <b5063e9f-5f25-e420-4b54-d88152830ef3@linux.intel.com> (raw) In-Reply-To: <82fb9cbc-915d-11d9-849f-f49e23edd29c@intel.com> On 28/10/2021 09:48, Matthew Auld wrote: > On 28/10/2021 02:43, Vivi, Rodrigo wrote: >> On Wed, 2021-10-27 at 10:48 +0100, Matthew Auld wrote: >>> On Wed, 27 Oct 2021 at 10:44, Jani Nikula >>> <jani.nikula@linux.intel.com> wrote: >>>> >>>> On Wed, 27 Oct 2021, Matthew Auld <matthew.william.auld@gmail.com> >>>> wrote: >>>>> On Wed, 27 Oct 2021 at 09:58, Jani Nikula >>>>> <jani.nikula@linux.intel.com> wrote: >>>>>> >>>>>> On Wed, 27 Oct 2021, Matthew Auld >>>>>> <matthew.william.auld@gmail.com> wrote: >>>>>>> On Thu, 21 Oct 2021 at 13:54, Matthew Auld >>>>>>> <matthew.auld@intel.com> 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@intel.com> >>>>>>>> Signed-off-by: Matthew Auld <matthew.auld@intel.com> >>>>>>>> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> >>>>>>> >>>>>>> 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.) >>>>> >>>>> Yeah, I forgot to add the fixes tag here unfortunately. >>>> >>>> Already merged? What's the commit id to be cherry-picked? Rodrigo >>>> can do >>>> it manually. >>> >>> Yeah, it was merged to gt-next: >>> >>> 777226dac058 ("drm/i915/dmabuf: fix broken build") >> >> picked up to drm-intel-next-fixes > > Thanks. Hmm it looks like we have this in -fixes (and in -gt) while Linus has explicitly thrown it out (see https://lists.freedesktop.org/archives/dri-devel/2021-November/330928.html). End result is that now we have a different Kernel Test Robot warning ("asm/smp.h is included more than once."). So we need to fish out "drm/i915/dmabuf: fix broken build" out from fixes with a revert or what? Regards, Tvrtko > >> >> thanks, >> Rodrigo. >> >>> >>>> >>>> Note to self, we should set up some way to check which maintainer >>>> is >>>> responsible for which branches and when. >>>> >>>> BR, >>>> Jani. >>>> >>>>> >>>>>> >>>>>> 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 >>>> >>>> -- >>>> Jani Nikula, Intel Open Source Graphics Center >>
next prev parent reply other threads:[~2021-11-22 13:34 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-21 12:53 [PATCH 1/2] drm/i915/dmabuf: fix broken build Matthew Auld 2021-10-21 12:53 ` [Intel-gfx] " Matthew Auld 2021-10-21 12:53 ` [PATCH 2/2] drm/i915/dmabuf: drop the flush on discrete Matthew Auld 2021-10-21 12:53 ` [Intel-gfx] " Matthew Auld 2021-10-22 9:26 ` Thomas Hellström 2021-10-22 9:26 ` [Intel-gfx] " Thomas Hellström 2021-10-22 9:47 ` Matthew Auld 2021-10-22 9:47 ` [Intel-gfx] " Matthew Auld 2021-10-28 15:31 ` Daniel Vetter 2021-10-21 14:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/dmabuf: fix broken build Patchwork 2021-10-21 15:18 ` [PATCH 1/2] " Dixit, Ashutosh 2021-10-21 15:18 ` [Intel-gfx] " Dixit, Ashutosh 2021-10-21 15:23 ` [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork 2021-10-21 18:16 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2021-10-27 7:57 ` [PATCH 1/2] " Matthew Auld 2021-10-27 7:57 ` [Intel-gfx] " Matthew Auld 2021-10-27 8:58 ` Jani Nikula 2021-10-27 8:58 ` [Intel-gfx] " Jani Nikula 2021-10-27 9:00 ` Jani Nikula 2021-10-27 9:00 ` [Intel-gfx] " Jani Nikula 2021-10-27 9:03 ` Matthew Auld 2021-10-27 9:03 ` [Intel-gfx] " Matthew Auld 2021-10-27 9:44 ` Jani Nikula 2021-10-27 9:44 ` [Intel-gfx] " Jani Nikula 2021-10-27 9:48 ` Matthew Auld 2021-10-27 9:48 ` [Intel-gfx] " Matthew Auld 2021-10-28 1:43 ` Vivi, Rodrigo 2021-10-28 1:43 ` [Intel-gfx] " Vivi, Rodrigo 2021-10-28 8:48 ` Matthew Auld 2021-10-28 8:48 ` [Intel-gfx] " Matthew Auld 2021-11-22 13:34 ` Tvrtko Ursulin [this message] 2021-11-22 13:34 ` Tvrtko Ursulin 2021-10-27 14:54 ` Lucas De Marchi 2021-10-27 14:54 ` Lucas De Marchi 2021-10-27 16:23 ` Matthew Auld 2021-10-27 16:23 ` [Intel-gfx] " Matthew Auld 2021-10-27 17:16 ` Lucas De Marchi 2021-10-27 17:16 ` [Intel-gfx] " Lucas De Marchi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b5063e9f-5f25-e420-4b54-d88152830ef3@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=lkp@intel.com \ --cc=matthew.auld@intel.com \ --cc=matthew.william.auld@gmail.com \ --cc=rodrigo.vivi@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.