Skip to content

Commit 46d53e2

Browse files
StanFox1984jnikula
authored andcommitted
Revert "drm/i915: Remove unneeded hack now for CDCLK"
This reverts commit 82ea174. Unfortunately according to our recent findings there is still some unidentified factor, requiring CDCLK to be set higher - otherwise we still get underruns on some multipipe configurations, despite CDCLK being set according to BSpec formula. So getting again back into debug mode to indentify the cause, meanwhile setting CDCLK=Pixel rate back in order to remove regression in 10% of the cases due to FIFO underruns. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> Fixes: cd19154 ("drm/i915: Adjust CDCLK accordingly to our DBuf bw needs") Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200608065552.21728-1-stanislav.lisovskiy@intel.com
1 parent 64cf40a commit 46d53e2

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/gpu/drm/i915/display/intel_cdclk.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,18 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state)
20712071
/* Account for additional needs from the planes */
20722072
min_cdclk = max(intel_planes_min_cdclk(crtc_state), min_cdclk);
20732073

2074+
/*
2075+
* HACK. Currently for TGL platforms we calculate
2076+
* min_cdclk initially based on pixel_rate divided
2077+
* by 2, accounting for also plane requirements,
2078+
* however in some cases the lowest possible CDCLK
2079+
* doesn't work and causing the underruns.
2080+
* Explicitly stating here that this seems to be currently
2081+
* rather a Hack, than final solution.
2082+
*/
2083+
if (IS_TIGERLAKE(dev_priv))
2084+
min_cdclk = max(min_cdclk, (int)crtc_state->pixel_rate);
2085+
20742086
if (min_cdclk > dev_priv->max_cdclk_freq) {
20752087
drm_dbg_kms(&dev_priv->drm,
20762088
"required cdclk (%d kHz) exceeds max (%d kHz)\n",

0 commit comments

Comments
 (0)