From: Jani Nikula <jani.nikula@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-xe] [PATCH 2/2] drm/i915/gt: drop dependency on VLV_DISPLAY_BASE
Date: Fri, 12 May 2023 10:43:35 +0300 [thread overview]
Message-ID: <20230512074335.1293293-2-jani.nikula@intel.com> (raw)
In-Reply-To: <20230512074335.1293293-1-jani.nikula@intel.com>
CHV_FUSE_GT (0x182168) is purely about GT fuses, therefore belongs in
intel_gt_regs.h, is in the gcfgmmio unit, but is technically in the VLV
display base area.
Add VLV_GUNIT_BASE to drop dependency on VLV_DISPLAY_BASE and thus
display/intel_display_reg_defs.h in intel_gt_regs.h.
v2: Add VLV_GUNIT_BASE (Ville)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230511152153.986676-1-jani.nikula@intel.com
(cherry picked from commit 6e4e9fbd5ba01eed13cb086ea645f8513370761d)
---
drivers/gpu/drm/i915/gt/intel_gt_regs.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index af80d2fe739b..61ef9b2c8878 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -7,7 +7,8 @@
#define __INTEL_GT_REGS__
#include "i915_reg_defs.h"
-#include "display/intel_display_reg_defs.h" /* VLV_DISPLAY_BASE */
+
+#define VLV_GUNIT_BASE 0x180000
/*
* The perf control registers are technically multicast registers, but the
@@ -1469,7 +1470,7 @@
#define GEN12_RCU_MODE _MMIO(0x14800)
#define GEN12_RCU_MODE_CCS_ENABLE REG_BIT(0)
-#define CHV_FUSE_GT _MMIO(VLV_DISPLAY_BASE + 0x2168)
+#define CHV_FUSE_GT _MMIO(VLV_GUNIT_BASE + 0x2168)
#define CHV_FGT_DISABLE_SS0 (1 << 10)
#define CHV_FGT_DISABLE_SS1 (1 << 11)
#define CHV_FGT_EU_DIS_SS0_R0_SHIFT 16
--
2.39.2
next prev parent reply other threads:[~2023-05-12 7:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 7:43 [Intel-xe] [PATCH 1/2] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-05-12 7:43 ` Jani Nikula [this message]
2023-05-12 10:57 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [1/2] " Patchwork
2023-05-12 10:59 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-05-12 11:03 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-05-12 11:24 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-05-15 14:00 ` [Intel-xe] [PATCH 1/2] " Jani Nikula
2023-05-15 14:41 ` Rodrigo Vivi
2023-05-15 16:42 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230512074335.1293293-2-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox