From 86435ca5140bca8bef52809560d7678b6a9a5400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 31 Mar 2026 18:42:58 +0300 Subject: [PATCH] drm/i915/mchbar: Use intel_de_read*() for MCHBAR register accesses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the naked intel_uncore_read*() with intel_de_read*() in the MCHBAR code. v2: Rebase due to intel_uncore_read64_2x32() Reviewed-by: Jani Nikula Signed-off-by: Ville Syrjälä Link: https://patch.msgid.link/20260331154259.24600-12-ville.syrjala@linux.intel.com --- drivers/gpu/drm/i915/display/intel_mchbar.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_mchbar.c b/drivers/gpu/drm/i915/display/intel_mchbar.c index a404fa38c9bd..16fcfe1e93ec 100644 --- a/drivers/gpu/drm/i915/display/intel_mchbar.c +++ b/drivers/gpu/drm/i915/display/intel_mchbar.c @@ -7,10 +7,10 @@ #include +#include "intel_de.h" #include "intel_display_core.h" #include "intel_mchbar.h" #include "intel_mchbar_regs.h" -#include "intel_uncore.h" static bool has_mchbar_mirror(struct intel_display *display) { @@ -59,28 +59,21 @@ static void assert_is_mchbar_reg(struct intel_display *display, i915_reg_t reg) u16 intel_mchbar_read16(struct intel_display *display, i915_reg_t reg) { - struct intel_uncore *uncore = to_intel_uncore(display->drm); - assert_is_mchbar_reg(display, reg); - return intel_uncore_read16(uncore, reg); + return intel_de_read16(display, reg); } u32 intel_mchbar_read(struct intel_display *display, i915_reg_t reg) { - struct intel_uncore *uncore = to_intel_uncore(display->drm); - assert_is_mchbar_reg(display, reg); - return intel_uncore_read(uncore, reg); + return intel_de_read(display, reg); } u64 intel_mchbar_read64_2x32(struct intel_display *display, i915_reg_t reg) { - struct intel_uncore *uncore = to_intel_uncore(display->drm); - i915_reg_t upper_reg = _MMIO(i915_mmio_reg_offset(reg) + 4); - assert_is_mchbar_reg(display, reg); - return intel_uncore_read64_2x32(uncore, reg, upper_reg); + return intel_de_read64_2x32(display, reg); }