summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2026-03-31 18:42:52 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2026-04-01 17:06:03 +0300
commit1b274a3de2f198d22b367abd0e48cd05887b2abb (patch)
tree71bfd9b2a51ec9afb5f821536882f49fdd9fe9c3
parent84b0366809193fc6238e37c9839cd4b24db5e909 (diff)
drm/i915/mchbar: Use intel_mchbar_read() instead of intel_de_read()
We are doing a few accesses to MCHBAR registers with intel_de_read(). Use the dedicated intel_mchbar_read() instead. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/20260331154259.24600-6-ville.syrjala@linux.intel.com
-rw-r--r--drivers/gpu/drm/i915/display/intel_cdclk.c5
-rw-r--r--drivers/gpu/drm/i915/display/intel_display_power.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 4a663dddf896..835a332e9686 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -41,6 +41,7 @@
#include "intel_display_utils.h"
#include "intel_display_wa.h"
#include "intel_dram.h"
+#include "intel_mchbar.h"
#include "intel_mchbar_regs.h"
#include "intel_parent.h"
#include "intel_pci_config.h"
@@ -376,8 +377,8 @@ static unsigned int intel_hpll_vco(struct intel_display *display)
else
return 0;
- tmp = intel_de_read(display, display->platform.pineview ||
- display->platform.mobile ? HPLLVCO_MOBILE : HPLLVCO);
+ tmp = intel_mchbar_read(display, display->platform.pineview ||
+ display->platform.mobile ? HPLLVCO_MOBILE : HPLLVCO);
vco = vco_table[tmp & 0x7];
if (vco == 0)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index b1c91de9d798..98e5a794fab7 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -24,6 +24,7 @@
#include "intel_display_wa.h"
#include "intel_dmc.h"
#include "intel_dram.h"
+#include "intel_mchbar.h"
#include "intel_mchbar_regs.h"
#include "intel_parent.h"
#include "intel_pch_refclk.h"
@@ -1252,7 +1253,7 @@ static void assert_can_disable_lcpll(struct intel_display *display)
static u32 hsw_read_dcomp(struct intel_display *display)
{
if (display->platform.haswell)
- return intel_de_read(display, D_COMP_HSW);
+ return intel_mchbar_read(display, D_COMP_HSW);
else
return intel_de_read(display, D_COMP_BDW);
}