Commit 44eba1b8 authored by Jani Nikula's avatar Jani Nikula

drm/i915/vrr: drop window2_delay member from i915

The window2_delay member has been functionally unused (always set to 0)
since it was added in commit bb265dbd ("drm/i915/xelpd: Add VRR
guardband for VRR CTL"). Replace it with a FIXME comment.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/036955dc2c4c2d2b2d89555e473d91ce1be10395.1661346845.git.jani.nikula@intel.com
parent c3704f19
...@@ -8686,8 +8686,6 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) ...@@ -8686,8 +8686,6 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
i915->flip_wq = alloc_workqueue("i915_flip", WQ_HIGHPRI | i915->flip_wq = alloc_workqueue("i915_flip", WQ_HIGHPRI |
WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE); WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE);
i915->window2_delay = 0; /* No DSB so no window2 delay */
intel_mode_config_init(i915); intel_mode_config_init(i915);
ret = intel_cdclk_init(i915); ret = intel_cdclk_init(i915);
......
...@@ -142,11 +142,16 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, ...@@ -142,11 +142,16 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
* For XE_LPD+, we use guardband and pipeline override * For XE_LPD+, we use guardband and pipeline override
* is deprecated. * is deprecated.
*/ */
if (DISPLAY_VER(i915) >= 13) if (DISPLAY_VER(i915) >= 13) {
/*
* FIXME: Subtract Window2 delay from below value.
*
* Window2 specifies time required to program DSB (Window2) in
* number of scan lines. Assuming 0 for no DSB.
*/
crtc_state->vrr.guardband = crtc_state->vrr.guardband =
crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay - crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay;
i915->window2_delay; } else {
else
/* /*
* FIXME: s/4/framestart_delay/ to get consistent * FIXME: s/4/framestart_delay/ to get consistent
* earliest/latest points for register latching regardless * earliest/latest points for register latching regardless
...@@ -159,6 +164,7 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state, ...@@ -159,6 +164,7 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
*/ */
crtc_state->vrr.pipeline_full = crtc_state->vrr.pipeline_full =
min(255, crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay - 4 - 1); min(255, crtc_state->vrr.vmin - adjusted_mode->crtc_vdisplay - 4 - 1);
}
crtc_state->mode_flags |= I915_MODE_FLAG_VRR; crtc_state->mode_flags |= I915_MODE_FLAG_VRR;
} }
......
...@@ -512,9 +512,6 @@ struct drm_i915_private { ...@@ -512,9 +512,6 @@ struct drm_i915_private {
struct file *mmap_singleton; struct file *mmap_singleton;
} gem; } gem;
/* Window2 specifies time required to program DSB (Window2) in number of scan lines */
u8 window2_delay;
u8 pch_ssc_use; u8 pch_ssc_use;
/* For i915gm/i945gm vblank irq workaround */ /* For i915gm/i945gm vblank irq workaround */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment