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 89288EB64D7 for ; Fri, 30 Jun 2023 11:50:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4491810E459; Fri, 30 Jun 2023 11:50:48 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6ADEB10E45A for ; Fri, 30 Jun 2023 11:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688125846; x=1719661846; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NOgEMAiM1V1InbK9y4z7W289q//+rnIsSe13/bitsW8=; b=faXzR1lyAxgGUjCBkNmlgNueRhmzqstPjWtVlp3gB3FOh1IAqKIsRCqR ZClDo6QIAZG/RB0VuTWFweFznf1laK5pVlLeeZ2Ju9ajV+SGTpiAP2Zmx UDQiVmhYqaNRYn9+1hnNN0YNzXJIIlU3FyELnfGg7Mu6XPZ+XVPNcp3Pd 1kJqULSXojKjOEACQDPrp0x1lIkfJmbFESlkBATRD3P1d1mmDODPmCSb1 EDRri3WkJofmY2ZwHWK0gdTr3vKwQGlUL6hwN+kFcQC97Pf8wFX1R1Wy7 7hsG2S/9HQ8fx9Kgg8iJNHgq4ZzMaHLyROuDW9DVT2sU7yjNi1TgCL8zZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="361223374" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="361223374" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 04:50:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="667914174" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="667914174" Received: from lpascal-mobl.amr.corp.intel.com (HELO localhost) ([10.252.49.62]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 04:50:44 -0700 From: Jani Nikula To: intel-xe@lists.freedesktop.org Date: Fri, 30 Jun 2023 14:50:18 +0300 Message-Id: <20230630115019.123675-5-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230630115019.123675-1-jani.nikula@intel.com> References: <20230630115019.123675-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [RESEND 4/5] fixup! drm/xe/display: Implement display support X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Lucas De Marchi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Add raw_reg_* accessors and use them. This is copy-paste from i915. Reviewed-by: Lucas De Marchi Signed-off-by: Jani Nikula --- .../drm/xe/compat-i915-headers/intel_uncore.h | 24 +++++++++++++++++++ drivers/gpu/drm/xe/display/ext/i915_irq.c | 15 ++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h index 652654b5481d..a46dca558366 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h @@ -140,4 +140,28 @@ static inline void intel_uncore_write_notrace(struct intel_uncore *uncore, xe_mmio_write32(__compat_uncore_to_gt(uncore), reg, val); } +static inline void __iomem *intel_uncore_regs(struct intel_uncore *uncore) +{ + struct xe_device *xe = container_of(uncore, struct xe_device, uncore); + + return xe_device_get_root_tile(xe)->mmio.regs; +} + +/* + * The raw_reg_{read,write} macros are intended as a micro-optimization for + * interrupt handlers so that the pointer indirection on uncore->regs can + * be computed once (and presumably cached in a register) instead of generating + * extra load instructions for each MMIO access. + * + * Given that these macros are only intended for non-GSI interrupt registers + * (and the goal is to avoid extra instructions generated by the compiler), + * these macros do not account for uncore->gsi_offset. Any caller that needs + * to use these macros on a GSI register is responsible for adding the + * appropriate GSI offset to the 'base' parameter. + */ +#define raw_reg_read(base, reg) \ + readl(base + i915_mmio_reg_offset(reg)) +#define raw_reg_write(base, reg, value) \ + writel(value, base + i915_mmio_reg_offset(reg)) + #endif /* __INTEL_UNCORE_H__ */ diff --git a/drivers/gpu/drm/xe/display/ext/i915_irq.c b/drivers/gpu/drm/xe/display/ext/i915_irq.c index 6235ff9dec36..157403d1d8fe 100644 --- a/drivers/gpu/drm/xe/display/ext/i915_irq.c +++ b/drivers/gpu/drm/xe/display/ext/i915_irq.c @@ -35,8 +35,10 @@ #include #include "i915_drv.h" +#include "i915_irq.h" #include "i915_reg.h" #include "icl_dsi_regs.h" +#include "intel_clock_gating.h" #include "intel_display_trace.h" #include "intel_display_types.h" #include "intel_dp_aux.h" @@ -48,19 +50,6 @@ #include "intel_psr_regs.h" #include "intel_uncore.h" -static u32 raw_reg_read(void __iomem *base, i915_reg_t reg) -{ - return readl(base + reg.reg); -} - -static void raw_reg_write(void __iomem *base, i915_reg_t reg, u32 value) -{ - writel(value, base + reg.reg); -} - -#include "i915_irq.h" -#include "intel_clock_gating.h" - static void gen3_irq_reset(struct xe_device *dev_priv, i915_reg_t imr, i915_reg_t iir, i915_reg_t ier) { -- 2.39.2