drm/i915/display: Program TRANS_VTOTAL from mode vtotal
Subsystems (3)
PATCH RESEND v2 1/1 drm/i915/display: Program TRANS_VTOTAL from mode vtotal
There are monitors being sensitive to MSA and end up blanking out when we override Vtotal, DP transcoder uses TRANS_VTOTAL to derive MSA VTotal. Avoid overriding crtc_vtotal to 1 on platform which supports VRR Timing generator and always program VTOTAL from mode timing in transcoder timing paths.
--v2:
- Remove write to crtc_state->hw.adjusted_mode.crtc_vtotal during intel_vrr_get_config. (Ankit)
Bspec: 70001
--- drivers/gpu/drm/i915/display/intel_display.c | 17 ----------------- drivers/gpu/drm/i915/display/intel_vrr.c | 10 ---------- 2 files changed, 27 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -17
@@ -2731,15 +2731,6 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_staHSYNC_START (adjusted_mode->crtc_hsync_start -1 ) | HSYNC_END(adjusted_mode->crtc_hsync_end - 1)); -/* -* For platforms that always use VRR Timing Generator, the VTOTAL.Vtotal -* bits are not required. Since the support for these bits is going to -* be deprecated in upcoming platforms, avoid writing these bits for the -* platforms that do not use legacy Timing Generator. -*/ -if (intel_vrr_always_use_vrr_tg (display)) - crtc_vtotal =1 ; -intel_de_write (display,TRANS_VTOTAL (display, cpu_transcoder),VACTIVE (crtc_vdisplay -1 ) |VTOTAL (crtc_vtotal -1 ));
@@ -2826,14 +2817,6 @@ static void intel_set_transcoder_timings_lrr(const struct intel_crtc_state *crtcintel_de_write (display,TRANS_VSYNC (display, cpu_transcoder),VSYNC_START (adjusted_mode->crtc_vsync_start -1 ) |VSYNC_END (adjusted_mode->crtc_vsync_end -1 )); -/* -* For platforms that always use VRR Timing Generator, the VTOTAL.Vtotal -* bits are not required. Since the support for these bits is going to -* be deprecated in upcoming platforms, avoid writing these bits for the -* platforms that do not use legacy Timing Generator. -*/ -if (intel_vrr_always_use_vrr_tg (display)) - crtc_vtotal =1 ;/* * The double buffer latch point for TRANS_VTOTAL
drivers/gpu/drm/i915/display/intel_vrr.c +0 -10
@@ -1097,16 +1097,6 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state) crtc_state->vrr.vmin +=intel_vrr_vmin_flipline_offset (display); } -/* -* For platforms that always use VRR Timing Generator, the VTOTAL.Vtotal -* bits are not filled. Since for these platforms TRAN_VMIN is always -* filled with crtc_vtotal, use TRAN_VRR_VMIN to get the vtotal for -* adjusted_mode. -*/ -if (intel_vrr_always_use_vrr_tg (display)) - crtc_state->hw.adjusted_mode.crtc_vtotal = -intel_vrr_vmin_vtotal (crtc_state); -if (HAS_AS_SDP (display)) { trans_vrr_vsync = intel_de_read(display,
Signature · 1 line
2.48.1
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915/display: Program TRANS_VTOTAL from mode vtotal (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/display: Program TRANS_VTOTAL from mode vtotal (rev3)
URL : https://patchwork.freedesktop.org/series/168578/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/168578/revisions/3/mbox/ not applied
Applying: drm/i915/display: Program TRANS_VTOTAL from mode vtotal
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/display/intel_vrr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_vrr.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/display: Program TRANS_VTOTAL from mode vtotal
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced