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 0A412C44508 for ; Wed, 21 Jan 2026 23:08:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C13FD10E8BA; Wed, 21 Jan 2026 23:08:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="iJZbAQxb"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D05810E8B9; Wed, 21 Jan 2026 23:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769036934; x=1800572934; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NL2gpSNjG91G6Z8MUJ9nigZAq7Mn+hz36OOhhTic3GQ=; b=iJZbAQxbCrK6KSMjN+VxKPoECrZfi8odqfEJKSThXiMjjiBYj2jmDtGD XqUvjOFPM7nEjauuZkUahTjWgEd4BeqpoGDtzmjMnGpe/LQkaICZVGID0 oNCQHOlouz19R2G71szI7CRWt9K8vdTwayHjY/L8r9zU0X+OSXT0o7mTM l2X4CDOpB/fTvif2f3ZQatjzL+tZ+WPDJhjEJZwE15czKh0nz6kFMurAB zIdNxdyBUYYFvUBQjOGlLX5/u47M7wDRW3dvRuUNKnNno7GXKjuEpPdg2 6jyoqmeUl3O1hcgUaZgcYMXeF1qz6dEaU+rcc47uajxbrDdhjqwcvuLXZ Q==; X-CSE-ConnectionGUID: q4MWqU71TFatMAoRn1+KSw== X-CSE-MsgGUID: 4iyq21WHSrKxzO/8RWiZBA== X-IronPort-AV: E=McAfee;i="6800,10657,11678"; a="70244997" X-IronPort-AV: E=Sophos;i="6.21,244,1763452800"; d="scan'208";a="70244997" 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:53 -0800 X-CSE-ConnectionGUID: p+x8fm61TOiMXY4ecrl9zQ== X-CSE-MsgGUID: URfJRS2CRnqFWuEK0o2osg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,244,1763452800"; d="scan'208";a="206889626" Received: from cfl-desktop.iind.intel.com ([10.190.239.20]) by fmviesa010.fm.intel.com with ESMTP; 21 Jan 2026 15:08:52 -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 13/19] drm/{i915, xe}: Remove i915_reg.h from intel_rom.c Date: Thu, 22 Jan 2026 04:54:08 +0530 Message-ID: <20260121232414.707192-14-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_rom.c free from including i915_reg.h. v2: Use display header instead of gmd common include (Jani) Signed-off-by: Uma Shankar --- drivers/gpu/drm/i915/display/intel_display_regs.h | 8 ++++++++ drivers/gpu/drm/i915/display/intel_rom.c | 3 +-- drivers/gpu/drm/i915/i915_reg.h | 8 -------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h index 2c7cd9002da3..f468e0d20b92 100644 --- a/drivers/gpu/drm/i915/display/intel_display_regs.h +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h @@ -9,6 +9,14 @@ #define GU_CNTL_PROTECTED _MMIO(0x10100C) #define DEPRESENT REG_BIT(9) +#define PRIMARY_SPI_TRIGGER _MMIO(0x102040) +#define PRIMARY_SPI_ADDRESS _MMIO(0x102080) +#define PRIMARY_SPI_REGIONID _MMIO(0x102084) +#define SPI_STATIC_REGIONS _MMIO(0x102090) +#define OPTIONROM_SPI_REGIONID_MASK REG_GENMASK(7, 0) +#define OROM_OFFSET _MMIO(0x1020c0) +#define OROM_OFFSET_MASK REG_GENMASK(20, 16) + #define _GEN7_PIPEA_DE_LOAD_SL 0x70068 #define _GEN7_PIPEB_DE_LOAD_SL 0x71068 #define GEN7_PIPE_DE_LOAD_SL(pipe) _MMIO_PIPE(pipe, _GEN7_PIPEA_DE_LOAD_SL, _GEN7_PIPEB_DE_LOAD_SL) diff --git a/drivers/gpu/drm/i915/display/intel_rom.c b/drivers/gpu/drm/i915/display/intel_rom.c index c8f615315310..d7de53acaba9 100644 --- a/drivers/gpu/drm/i915/display/intel_rom.c +++ b/drivers/gpu/drm/i915/display/intel_rom.c @@ -7,10 +7,9 @@ #include -#include "i915_reg.h" - #include "intel_rom.h" #include "intel_uncore.h" +#include "intel_display_regs.h" struct intel_rom { /* for PCI ROM */ diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 5d640f7cfc23..d43c04e491e1 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -892,14 +892,6 @@ #define SGGI_DIS REG_BIT(15) #define SGR_DIS REG_BIT(13) -#define PRIMARY_SPI_TRIGGER _MMIO(0x102040) -#define PRIMARY_SPI_ADDRESS _MMIO(0x102080) -#define PRIMARY_SPI_REGIONID _MMIO(0x102084) -#define SPI_STATIC_REGIONS _MMIO(0x102090) -#define OPTIONROM_SPI_REGIONID_MASK REG_GENMASK(7, 0) -#define OROM_OFFSET _MMIO(0x1020c0) -#define OROM_OFFSET_MASK REG_GENMASK(20, 16) - #define MTL_MEDIA_GSI_BASE 0x380000 #endif /* _I915_REG_H_ */ -- 2.50.1