drm/i915/mchbar: Use intel_de_read*() for MCHBAR register accesses

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 <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260331154259.24600-12-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2026-03-31 18:42:58 +03:00
parent 38105260ba
commit 86435ca514

View File

@ -7,10 +7,10 @@
#include <drm/drm_print.h>
#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);
}