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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F2F5AC433EF for ; Mon, 22 Nov 2021 15:31:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00B5389C54; Mon, 22 Nov 2021 15:31:31 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14F4A89C48; Mon, 22 Nov 2021 15:31:29 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10175"; a="215518138" X-IronPort-AV: E=Sophos;i="5.87,255,1631602800"; d="scan'208";a="215518138" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2021 07:31:28 -0800 X-IronPort-AV: E=Sophos;i="5.87,255,1631602800"; d="scan'208";a="537908199" Received: from aalazizi-mobl1.amr.corp.intel.com (HELO [10.213.249.159]) ([10.213.249.159]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2021 07:31:25 -0800 Message-ID: Date: Mon, 22 Nov 2021 15:31:23 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.1 Content-Language: en-US To: Matthew Auld , Intel-gfx@lists.freedesktop.org References: <20211122135758.85444-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH] Revert "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: , Cc: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= , Jani Nikula , Daniel Vetter , dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 22/11/2021 14:04, Matthew Auld wrote: > On 22/11/2021 13:57, Tvrtko Ursulin wrote: >> From: Tvrtko Ursulin >> >> This reverts commit 777226dac058d119286b4081953cb5aa2cb7394b. >> >> Approach taken in the patch was rejected by Linus and the upstream tree >> now already contains the required include directive via 304ac8032d3f >> ("Merge tag 'drm-next-2021-11-12' of >> git://anongit.freedesktop.org/drm/drm"). >> >> Signed-off-by: Tvrtko Ursulin >> Fixes: 777226dac058 ("drm/i915/dmabuf: fix broken build") >> Cc: Matthew Auld >> Cc: Thomas Hellström >> Cc: Daniel Vetter >> Cc: Joonas Lahtinen >> Cc: Rodrigo Vivi >> Cc: Jani Nikula > > Acked-by: Matthew Auld > > This was copy-paste from gem/i915_gem_pm.c, does that need a similar patch? Personally I don't think we need to act immediately and can wait until the !x86 build efforts crystalize things for us a bit. At least the commentary and commit in i915_gem_pm.c give rationale on pros and cons of clflush vs wbinvd. And commentary in i915_gem_dmabuf.c makes it sound we cannot simply go to clflush there in all cases. Regards, Tvrtko > >> --- >>   drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 ------- >>   1 file changed, 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> index f291cf4c3886..1b526039a60d 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c >> @@ -17,13 +17,6 @@ >>   MODULE_IMPORT_NS(DMA_BUF); >> -#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 *buf) >>