drm/i915/de: s/intel_de_read64_2x32()/intel_de_read64_2x32_volatile()/

The raison d'etre of intel_de_read64_2x32() is that it can
handle registers where volatile values are split across two
registers. I don't like that it's being used needlessly.

Rename it to intel_de_read64_2x32_volatile() to make it
more clear when it should be used.

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-9-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
index 3f9861b7a589eaf9c18b35c8f2ca01417ed10739..295e7176b732aed65047e2cde778b08a138cbae7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_de.h
+++ b/drivers/gpu/drm/i915/display/intel_de.h
@@ -36,8 +36,8 @@ intel_de_read(struct intel_display *display, i915_reg_t reg)
 }
 
 static inline u64
-intel_de_read64_2x32(struct intel_display *display,
-                    i915_reg_t lower_reg, i915_reg_t upper_reg)
+intel_de_read64_2x32_volatile(struct intel_display *display,
+                             i915_reg_t lower_reg, i915_reg_t upper_reg)
 {
        u64 val;
 

diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index 1b7cfe226ff8f74c3246ca4a91e5d2783d6f259c..0726a2abed38f797f5f0bb2c5ba2b10eb5bae9ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -109,8 +109,8 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)
         * we get a low value that's stable across two reads of the high
         * register.
         */
-       frame = intel_de_read64_2x32(display, PIPEFRAMEPIXEL(display, pipe),
-                                    PIPEFRAME(display, pipe));
+       frame = intel_de_read64_2x32_volatile(display, PIPEFRAMEPIXEL(display, pipe),
+                                             PIPEFRAME(display, pipe));
 
        pixel = frame & PIPE_PIXEL_MASK;
        frame = (frame >> PIPE_FRAME_LOW_SHIFT) & 0xffffff;

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index 8a957804cb9700034f345ee13c71d5950a9265e2..ae5385e9288997a6047f83b1d83602a8731dbdf1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -1053,11 +1053,11 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
 
        if (crtc_state->cmrr.enable) {
                crtc_state->cmrr.cmrr_n =
-                       intel_de_read64_2x32(display, TRANS_CMRR_N_LO(display, cpu_transcoder),
-                                            TRANS_CMRR_N_HI(display, cpu_transcoder));
+                       intel_de_read64_2x32_volatile(display, TRANS_CMRR_N_LO(display, cpu_transcoder),
+                                                     TRANS_CMRR_N_HI(display, cpu_transcoder));
                crtc_state->cmrr.cmrr_m =
-                       intel_de_read64_2x32(display, TRANS_CMRR_M_LO(display, cpu_transcoder),
-                                            TRANS_CMRR_M_HI(display, cpu_transcoder));
+                       intel_de_read64_2x32_volatile(display, TRANS_CMRR_M_LO(display, cpu_transcoder),
+                                                     TRANS_CMRR_M_HI(display, cpu_transcoder));
        }
 
        if (DISPLAY_VER(display) >= 13) {