On Tue, Aug 23, 2022 at 11:01:28AM +0200, Maarten Lankhorst wrote: > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_bw.c | 8 ++-- > drivers/gpu/drm/i915/display/intel_crt.c | 33 +++++++------ > drivers/gpu/drm/i915/display/intel_de.h | 47 +++++++++++++++++++ > .../drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/display/intel_dmc.c | 6 +-- > drivers/gpu/drm/i915/display/intel_dp_aux.c | 30 ++++++------ > drivers/gpu/drm/i915/display/intel_dpio_phy.c | 9 ++-- > drivers/gpu/drm/i915/display/intel_fbc.c | 10 +--- > drivers/gpu/drm/i915/display/intel_gmbus.c | 42 ++++++++--------- > drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +-- > drivers/gpu/drm/i915/display/intel_snps_phy.c | 11 ++--- > 11 files changed, 118 insertions(+), 86 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c > index 8ecf4e3e2bc6..1ca588e31dc9 100644 > --- a/drivers/gpu/drm/i915/display/intel_bw.c > +++ b/drivers/gpu/drm/i915/display/intel_bw.c > @@ -42,7 +42,7 @@ static int dg1_mchbar_read_qgv_point_info(struct drm_i915_private *dev_priv, > u32 dclk_ratio, dclk_reference; > u32 val; > > - val = intel_uncore_read(&dev_priv->uncore, SA_PERF_STATUS_0_0_0_MCHBAR_PC); > + val = intel_de_read(dev_priv, SA_PERF_STATUS_0_0_0_MCHBAR_PC); Surely these aren't display engine registers? If we start (ab)using intel_de_*() for everything we may end up in a bigger mess for the upcoming forcewake thing... -- Ville Syrjälä Intel
