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 3AE9DC433EF for ; Thu, 3 Feb 2022 17:30:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A315D10E504; Thu, 3 Feb 2022 17:29:59 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A47F10E4FF for ; Thu, 3 Feb 2022 17:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643909398; x=1675445398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0faIJeanSVg4TVsukZep2SH9zNSBXKIPlWiirFMZ1bw=; b=GXL9gkaky3WRbHIUwI5/EaSKpF2qIE+3uq/zm3M0DBuNUIEVo4z4b8FY jQ6IvTzXXLqP8hoYVSlHQ2XH0q0GX5rn1LgGtitEHTS9WTNEeHYB/6QjG HYWzGwPZHmyfBJlj6ReqgnLOtseeglQSlH82xHXh3egumOMmpD2o8ZO+J 9D0c+wnK9cfT7NBUVgt9fjZP4piR1rnFP3JZ/x2+rwMp/pf1E9GLRJHzs L68TNubfnJOmdXZahhbEJfeV7FPlBXRDowaS4wCDKtrNvsqbl57bIRkwJ I4puEOSVxL2S5+pGmj3tsLuPPQYwUIIc7/A7ZwFW33h0RDQCV1KytdEnK Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10247"; a="248411951" X-IronPort-AV: E=Sophos;i="5.88,340,1635231600"; d="scan'208";a="248411951" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2022 09:29:58 -0800 X-IronPort-AV: E=Sophos;i="5.88,340,1635231600"; d="scan'208";a="676844993" Received: from jtvanhoo-mobl.amr.corp.intel.com (HELO mvcheng-desk2.intel.com) ([10.212.132.101]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2022 09:29:57 -0800 From: Michael Cheng To: gfx-internal-devel@eclists.intel.com Subject: [PATCH v4 1/4] drm/i915/gt: Re-work intel_write_status_page Date: Thu, 3 Feb 2022 09:29:50 -0800 Message-Id: <20220203172953.371921-2-michael.cheng@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220203172953.371921-1-michael.cheng@intel.com> References: <20220203172953.371921-1-michael.cheng@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Cc: tvrtko.ursulin@linux.intel.com, michael.cheng@intel.com, wayne.boyer@intel.com, casey.g.bowman@intel.com, lucas.demarchi@intel.com, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Re-work intel_write_status_page to use drm_clflush_virt_range. This will prevent compiler errors when building for non-x86 architectures. Signed-off-by: Michael Cheng --- drivers/gpu/drm/i915/gt/intel_engine.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h index 0e353d8c2bc8..986777c2430d 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine.h +++ b/drivers/gpu/drm/i915/gt/intel_engine.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -143,15 +144,9 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value) * of extra paranoia to try and ensure that the HWS takes the value * we give and that it doesn't end up trapped inside the CPU! */ - if (static_cpu_has(X86_FEATURE_CLFLUSH)) { - mb(); - clflush(&engine->status_page.addr[reg]); - engine->status_page.addr[reg] = value; - clflush(&engine->status_page.addr[reg]); - mb(); - } else { - WRITE_ONCE(engine->status_page.addr[reg], value); - } + drm_clflush_virt_range(&engine->status_page.addr[reg], sizeof(value)); + WRITE_ONCE(engine->status_page.addr[reg], value); + drm_clflush_virt_range(&engine->status_page.addr[reg], sizeof(value)); } /* -- 2.25.1