From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B852AC433EF for ; Wed, 27 Oct 2021 09:44:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F20E6103C for ; Wed, 27 Oct 2021 09:44:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F20E6103C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 369806E876; Wed, 27 Oct 2021 09:44:13 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D3E16E876; Wed, 27 Oct 2021 09:44:12 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10149"; a="228874325" X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="228874325" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 02:44:10 -0700 X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="497792583" Received: from smaharan-mobl.gar.corp.intel.com (HELO localhost) ([10.251.214.195]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 02:44:07 -0700 From: Jani Nikula To: Matthew Auld Cc: Matthew Auld , Intel Graphics Development , ML dri-devel , kernel test robot , Thomas =?utf-8?Q?Hellstr=C3=B6m?= , Rodrigo Vivi Subject: Re: [PATCH 1/2] drm/i915/dmabuf: fix broken build In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211021125332.2455288-1-matthew.auld@intel.com> <87k0hyj13f.fsf@intel.com> Date: Wed, 27 Oct 2021 12:44:03 +0300 Message-ID: <87cznqiyzg.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 27 Oct 2021, Matthew Auld wrote: > On Wed, 27 Oct 2021 at 09:58, Jani Nikula w= rote: >> >> On Wed, 27 Oct 2021, Matthew Auld wrote: >> > On Thu, 21 Oct 2021 at 13:54, Matthew Auld wr= ote: >> >> >> >> 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 >> >> Signed-off-by: Matthew Auld >> >> Cc: Thomas Hellstr=C3=B6m >> > >> > 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. 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 >> >> +#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 *bu= f) >> >> -- >> >> 2.26.3 >> >> >> >> -- >> Jani Nikula, Intel Open Source Graphics Center --=20 Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37EEEC433EF for ; Wed, 27 Oct 2021 09:44:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F32206103C for ; Wed, 27 Oct 2021 09:44:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F32206103C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4378E6E879; Wed, 27 Oct 2021 09:44:13 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D3E16E876; Wed, 27 Oct 2021 09:44:12 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10149"; a="228874325" X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="228874325" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 02:44:10 -0700 X-IronPort-AV: E=Sophos;i="5.87,186,1631602800"; d="scan'208";a="497792583" Received: from smaharan-mobl.gar.corp.intel.com (HELO localhost) ([10.251.214.195]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 02:44:07 -0700 From: Jani Nikula To: Matthew Auld Cc: Matthew Auld , Intel Graphics Development , ML dri-devel , kernel test robot , Thomas =?utf-8?Q?Hellstr=C3=B6m?= , Rodrigo Vivi In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211021125332.2455288-1-matthew.auld@intel.com> <87k0hyj13f.fsf@intel.com> Date: Wed, 27 Oct 2021 12:44:03 +0300 Message-ID: <87cznqiyzg.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/dmabuf: fix broken build X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 27 Oct 2021, Matthew Auld wrote: > On Wed, 27 Oct 2021 at 09:58, Jani Nikula w= rote: >> >> On Wed, 27 Oct 2021, Matthew Auld wrote: >> > On Thu, 21 Oct 2021 at 13:54, Matthew Auld wr= ote: >> >> >> >> 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 >> >> Signed-off-by: Matthew Auld >> >> Cc: Thomas Hellstr=C3=B6m >> > >> > 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. 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 >> >> +#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 *bu= f) >> >> -- >> >> 2.26.3 >> >> >> >> -- >> Jani Nikula, Intel Open Source Graphics Center --=20 Jani Nikula, Intel Open Source Graphics Center