mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
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
This commit is contained in:
parent
ed3643fb13
commit
581feef634
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user