mirror of
https://github.com/torvalds/linux.git
synced 2026-10-13 22:01:02 +02:00
drm/i915/display: Rename cpu_transcoder parameter to transcoder
intel_set_transcoder_timings() now takes the target transcoder as an explicit argument rather than implicitly using crtc_state->cpu_transcoder, so the parameter name 'cpu_transcoder' is misleading. Rename it to plain 'transcoder' to reflect that any transcoder may be programmed. No functional change. Signed-off-by: Animesh Manna <animesh.manna@intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> Link: https://patch.msgid.link/20260615200339.885190-6-animesh.manna@intel.com
This commit is contained in:
parent
d671b9328d
commit
0423aeb70d
|
|
@ -133,7 +133,7 @@
|
|||
#include "vlv_dsi_regs.h"
|
||||
|
||||
static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state,
|
||||
enum transcoder cpu_transcoder);
|
||||
enum transcoder transcoder);
|
||||
static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state);
|
||||
static void hsw_set_transconf(const struct intel_crtc_state *crtc_state);
|
||||
static void bdw_set_pipe_misc(struct intel_dsb *dsb,
|
||||
|
|
@ -2666,7 +2666,7 @@ transcoder_has_vrr(const struct intel_crtc_state *crtc_state)
|
|||
}
|
||||
|
||||
static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state,
|
||||
enum transcoder cpu_transcoder)
|
||||
enum transcoder transcoder)
|
||||
{
|
||||
struct intel_display *display = to_intel_display(crtc_state);
|
||||
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
||||
|
|
@ -2675,7 +2675,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
u32 crtc_vdisplay, crtc_vtotal, crtc_vblank_start, crtc_vblank_end;
|
||||
int vsyncshift = 0;
|
||||
|
||||
drm_WARN_ON(display->drm, transcoder_is_dsi(cpu_transcoder));
|
||||
drm_WARN_ON(display->drm, transcoder_is_dsi(transcoder));
|
||||
|
||||
/* We need to be careful not to changed the adjusted mode, for otherwise
|
||||
* the hw state checker will get angry at the mismatch. */
|
||||
|
|
@ -2704,7 +2704,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
*/
|
||||
if (DISPLAY_VER(display) >= 13) {
|
||||
intel_de_write(display,
|
||||
TRANS_SET_CONTEXT_LATENCY(display, cpu_transcoder),
|
||||
TRANS_SET_CONTEXT_LATENCY(display, transcoder),
|
||||
crtc_state->set_context_latency);
|
||||
|
||||
/*
|
||||
|
|
@ -2719,16 +2719,16 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
|
||||
if (DISPLAY_VER(display) >= 4 && DISPLAY_VER(display) < 35)
|
||||
intel_de_write(display,
|
||||
TRANS_VSYNCSHIFT(display, cpu_transcoder),
|
||||
TRANS_VSYNCSHIFT(display, transcoder),
|
||||
vsyncshift);
|
||||
|
||||
intel_de_write(display, TRANS_HTOTAL(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_HTOTAL(display, transcoder),
|
||||
HACTIVE(adjusted_mode->crtc_hdisplay - 1) |
|
||||
HTOTAL(adjusted_mode->crtc_htotal - 1));
|
||||
intel_de_write(display, TRANS_HBLANK(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_HBLANK(display, transcoder),
|
||||
HBLANK_START(adjusted_mode->crtc_hblank_start - 1) |
|
||||
HBLANK_END(adjusted_mode->crtc_hblank_end - 1));
|
||||
intel_de_write(display, TRANS_HSYNC(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_HSYNC(display, transcoder),
|
||||
HSYNC_START(adjusted_mode->crtc_hsync_start - 1) |
|
||||
HSYNC_END(adjusted_mode->crtc_hsync_end - 1));
|
||||
|
||||
|
|
@ -2741,13 +2741,13 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
if (intel_vrr_always_use_vrr_tg(display))
|
||||
crtc_vtotal = 1;
|
||||
|
||||
intel_de_write(display, TRANS_VTOTAL(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_VTOTAL(display, transcoder),
|
||||
VACTIVE(crtc_vdisplay - 1) |
|
||||
VTOTAL(crtc_vtotal - 1));
|
||||
intel_de_write(display, TRANS_VBLANK(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_VBLANK(display, transcoder),
|
||||
VBLANK_START(crtc_vblank_start - 1) |
|
||||
VBLANK_END(crtc_vblank_end - 1));
|
||||
intel_de_write(display, TRANS_VSYNC(display, cpu_transcoder),
|
||||
intel_de_write(display, TRANS_VSYNC(display, transcoder),
|
||||
VSYNC_START(adjusted_mode->crtc_vsync_start - 1) |
|
||||
VSYNC_END(adjusted_mode->crtc_vsync_end - 1));
|
||||
|
||||
|
|
@ -2755,7 +2755,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
* programmed with the VTOTAL_EDP value. Same for VTOTAL_C. This is
|
||||
* documented on the DDI_FUNC_CTL register description, EDP Input Select
|
||||
* bits. */
|
||||
if (display->platform.haswell && cpu_transcoder == TRANSCODER_EDP &&
|
||||
if (display->platform.haswell && transcoder == TRANSCODER_EDP &&
|
||||
(pipe == PIPE_B || pipe == PIPE_C))
|
||||
intel_de_write(display, TRANS_VTOTAL(display, pipe),
|
||||
VACTIVE(crtc_vdisplay - 1) |
|
||||
|
|
@ -2770,7 +2770,7 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
|
|||
* followed by BE which DPRX devices are unable to handle.
|
||||
* https://groups.vesa.org/wg/DP/document/20494
|
||||
*/
|
||||
intel_de_write(display, DP_MIN_HBLANK_CTL(cpu_transcoder),
|
||||
intel_de_write(display, DP_MIN_HBLANK_CTL(transcoder),
|
||||
crtc_state->min_hblank);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user