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 87FC9D4695A for ; Wed, 21 Jan 2026 23:08:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 460A310E8AC; Wed, 21 Jan 2026 23:08:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FxNXg0MA"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id B32FF10E267; Wed, 21 Jan 2026 23:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769036922; x=1800572922; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4IYIxggpt9bPcfPMcbuROgrwRfX7v80R5KnBYND1Ynk=; b=FxNXg0MAHzeXb42LbE85ejCMNJR7z3DsLRk8PAZ8IyYuW1COuO+2jmqB H9nZrhIImlA6LaLWEtN+rvO/B/RBObhWqECY9sqlttPyfb5G0vbJuxI5D 4MOa055COaE9TToFUVpIPZNQ3hmvdoMwYkN++dEmrLEwsvkX5UbMnPSJb G+ls7l8X96d+bMqg7yTaxx3Y3gO1MYTd5HZVPF/1Fbg0qhiLZfwIqVki5 ri+6Ysm6H9kgGUcvUQIYffv1Wg4PJW8HNlXh9It/PdnRKO+G2jLQDeCUk uu5/21paA1QyOeCC/Z47rcK1TgMgAeq1SRMdAPazNxFwe0TguzLe7w0P8 A==; X-CSE-ConnectionGUID: lRb1IdeeSR6rijvgGIgDFw== X-CSE-MsgGUID: LRz5pM76SV2ds+9bavsxNg== X-IronPort-AV: E=McAfee;i="6800,10657,11678"; a="70244984" X-IronPort-AV: E=Sophos;i="6.21,244,1763452800"; d="scan'208";a="70244984" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2026 15:08:41 -0800 X-CSE-ConnectionGUID: uMsywyBlRGGY2bXsMHXSkg== X-CSE-MsgGUID: q1OGKSaDR4iGSk8ReYU2vg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,244,1763452800"; d="scan'208";a="206889587" Received: from cfl-desktop.iind.intel.com ([10.190.239.20]) by fmviesa010.fm.intel.com with ESMTP; 21 Jan 2026 15:08:40 -0800 From: Uma Shankar To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com, Uma Shankar Subject: [v2 07/19] drm/{i915, xe}: Remove i915_reg.h from intel_dram.c Date: Thu, 22 Jan 2026 04:54:02 +0530 Message-ID: <20260121232414.707192-8-uma.shankar@intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260121232414.707192-1-uma.shankar@intel.com> References: <20260121232414.707192-1-uma.shankar@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Make intel_dram.c free from including i915_reg.h. Signed-off-by: Uma Shankar --- drivers/gpu/drm/i915/display/intel_display_regs.h | 6 +++++- drivers/gpu/drm/i915/display/intel_dram.c | 3 ++- drivers/gpu/drm/i915/i915_reg.h | 6 ------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h index 3447ee229354..f395b7d4d640 100644 --- a/drivers/gpu/drm/i915/display/intel_display_regs.h +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h @@ -3075,6 +3075,10 @@ enum skl_power_gate { #define MTL_TRAS_MASK REG_GENMASK(16, 8) #define MTL_TRDPRE_MASK REG_GENMASK(7, 0) - +#define MTL_MEM_SS_INFO_GLOBAL _MMIO(0x45700) +#define XE3P_ECC_IMPACTING_DE REG_BIT(12) +#define MTL_N_OF_ENABLED_QGV_POINTS_MASK REG_GENMASK(11, 8) +#define MTL_N_OF_POPULATED_CH_MASK REG_GENMASK(7, 4) +#define MTL_DDR_TYPE_MASK REG_GENMASK(3, 0) #endif /* __INTEL_DISPLAY_REGS_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_dram.c b/drivers/gpu/drm/i915/display/intel_dram.c index 170de304fe96..73a127dd6720 100644 --- a/drivers/gpu/drm/i915/display/intel_dram.c +++ b/drivers/gpu/drm/i915/display/intel_dram.c @@ -7,10 +7,11 @@ #include #include +#include -#include "i915_reg.h" #include "intel_display_core.h" #include "intel_display_utils.h" +#include "intel_display_regs.h" #include "intel_dram.h" #include "intel_mchbar_regs.h" #include "intel_pcode.h" diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index fac24a649d61..c9fb9af1a35c 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -1005,12 +1005,6 @@ #define OROM_OFFSET _MMIO(0x1020c0) #define OROM_OFFSET_MASK REG_GENMASK(20, 16) -#define MTL_MEM_SS_INFO_GLOBAL _MMIO(0x45700) -#define XE3P_ECC_IMPACTING_DE REG_BIT(12) -#define MTL_N_OF_ENABLED_QGV_POINTS_MASK REG_GENMASK(11, 8) -#define MTL_N_OF_POPULATED_CH_MASK REG_GENMASK(7, 4) -#define MTL_DDR_TYPE_MASK REG_GENMASK(3, 0) - #define MTL_MEDIA_GSI_BASE 0x380000 #endif /* _I915_REG_H_ */ -- 2.50.1