mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
drm/i915/vrr: Move EMP_AS_SDP_TL write into intel_vrr_set_transcoder_timings()
EMP_AS_SDL_TL replaces the TRANS_VRR_VSYNC for the purposes of setting the AS SDP transmission line. Move the EMP_AS_SDL_TL into intel_vrr_set_transcoder_timings() since that's where we write TRANS_VRR_VSYNC as well. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20251020185038.4272-11-ville.syrjala@linux.intel.com Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
This commit is contained in:
parent
587db4b310
commit
4353128252
|
|
@ -571,6 +571,18 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)
|
|||
TRANS_VRR_VSYNC(display, cpu_transcoder),
|
||||
VRR_VSYNC_END(crtc_state->vrr.vsync_end) |
|
||||
VRR_VSYNC_START(crtc_state->vrr.vsync_start));
|
||||
|
||||
/*
|
||||
* For BMG and LNL+ onwards the EMP_AS_SDP_TL is used for programming
|
||||
* double buffering point and transmission line for VRR packets for
|
||||
* HDMI2.1/DP/eDP/DP->HDMI2.1 PCON.
|
||||
* Since currently we support VRR only for DP/eDP, so this is programmed
|
||||
* to for Adaptive Sync SDP to Vsync start.
|
||||
*/
|
||||
if (DISPLAY_VERx100(display) == 1401 || DISPLAY_VER(display) >= 20)
|
||||
intel_de_write(display,
|
||||
EMP_AS_SDP_TL(display, cpu_transcoder),
|
||||
EMP_AS_SDP_DB_TL(crtc_state->vrr.vsync_start));
|
||||
}
|
||||
|
||||
void intel_vrr_send_push(struct intel_dsb *dsb,
|
||||
|
|
@ -649,25 +661,6 @@ bool intel_vrr_always_use_vrr_tg(struct intel_display *display)
|
|||
return false;
|
||||
}
|
||||
|
||||
static
|
||||
void intel_vrr_set_db_point_and_transmission_line(const struct intel_crtc_state *crtc_state)
|
||||
{
|
||||
struct intel_display *display = to_intel_display(crtc_state);
|
||||
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
||||
|
||||
/*
|
||||
* For BMG and LNL+ onwards the EMP_AS_SDP_TL is used for programming
|
||||
* double buffering point and transmission line for VRR packets for
|
||||
* HDMI2.1/DP/eDP/DP->HDMI2.1 PCON.
|
||||
* Since currently we support VRR only for DP/eDP, so this is programmed
|
||||
* to for Adaptive Sync SDP to Vsync start.
|
||||
*/
|
||||
if (DISPLAY_VERx100(display) == 1401 || DISPLAY_VER(display) >= 20)
|
||||
intel_de_write(display,
|
||||
EMP_AS_SDP_TL(display, cpu_transcoder),
|
||||
EMP_AS_SDP_DB_TL(crtc_state->vrr.vsync_start));
|
||||
}
|
||||
|
||||
static int intel_vrr_hw_vmin(const struct intel_crtc_state *crtc_state)
|
||||
{
|
||||
struct intel_display *display = to_intel_display(crtc_state);
|
||||
|
|
@ -710,8 +703,6 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
|
|||
intel_vrr_set_vrr_timings(crtc_state);
|
||||
|
||||
if (!intel_vrr_always_use_vrr_tg(display)) {
|
||||
intel_vrr_set_db_point_and_transmission_line(crtc_state);
|
||||
|
||||
intel_de_write(display, TRANS_PUSH(display, cpu_transcoder),
|
||||
TRANS_PUSH_EN);
|
||||
|
||||
|
|
@ -773,8 +764,6 @@ void intel_vrr_transcoder_enable(const struct intel_crtc_state *crtc_state)
|
|||
intel_de_write(display, TRANS_PUSH(display, cpu_transcoder),
|
||||
TRANS_PUSH_EN);
|
||||
|
||||
intel_vrr_set_db_point_and_transmission_line(crtc_state);
|
||||
|
||||
intel_de_write(display, TRANS_VRR_CTL(display, cpu_transcoder),
|
||||
VRR_CTL_VRR_ENABLE | trans_vrr_ctl(crtc_state));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user