[PATCH v6 7/7] drm/i915/dsc: Check if vblank is sufficient for dsc prefill
Nautiyal, Ankit K
ankit.k.nautiyal at intel.com
Fri Jan 17 06:34:54 UTC 2025
On 1/16/2025 10:01 PM, Mitul Golani wrote:
> High refresh rate panels which may have small line times
> and vblank sizes, Check if vblank size is sufficient for
> dsc prefill latency.
>
> --v2:
> - Consider chroma downscaling factor in latency calculation. [Ankit]
> - Replace with appropriate function name.
>
> --v3:
> - Remove FIXME tag.[Ankit]
> - Replace Ycbcr444 to Ycbcr420.[Ankit]
> - Correct precision. [Ankit]
> - Use some local valiables like linetime_factor and latency to
> adjust precision.
> - Declare latency to 0 initially to avoid returning any garbage values.
> - Account for second scaler downscaling factor as well. [Ankit]
>
> --v4:
> - Improvise hscale and vscale calculation. [Ankit]
> - Use appropriate name for number of scaler users. [Ankit]
> - Update commit message and rebase.
> - Add linetime and cdclk prefill adjustment calculation. [Ankit]
>
> --v5:
> - Update bspec link in trailer. [Ankit]
> - Correct hscale, vscale datatype. [Ankit]
> - Use intel_crtc_compute_min_cdclk. [Ankit]
>
> Bspec: 70151
Avoid blank line here.
>
> Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani at intel.com>
> ---
> drivers/gpu/drm/i915/display/skl_watermark.c | 34 +++++++++++++++++++-
> 1 file changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 792e59685578..22fc81a61977 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -2292,6 +2292,38 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,
> return 0;
> }
>
> +static int
> +dsc_prefill_latency(const struct intel_crtc_state *crtc_state)
> +{
> + const struct intel_crtc_scaler_state *scaler_state =
> + &crtc_state->scaler_state;
> + int latency = 0;
> + int num_scaler_users = hweight32(scaler_state->scaler_users);
> + int chroma_downscaling_factor =
> + crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ? 2 : 1;
> + u64 hscale_k[2] = {0, 0};
> + u64 vscale_k[2] = {0, 0};
> +
> + if (!crtc_state->dsc.compression_enable || !num_scaler_users)
> + return latency;
> +
> + for (int i = 0; i < num_scaler_users; i++) {
> + hscale_k[i] =
> + max(1000, mul_u32_u32(scaler_state->scalers[i].hscale, 1000) >> 16);
> + vscale_k[i] =
> + max(1000, mul_u32_u32(scaler_state->scalers[i].vscale, 1000) >> 16);
> + }
> +
> + latency = DIV_ROUND_UP_ULL(hscale_k[0] * vscale_k[0], 1000000);
> +
> + if (num_scaler_users > 1)
> + latency *= DIV_ROUND_UP_ULL(hscale_k[1] * vscale_k[1], 1000000);
> +
> + latency *= DIV_ROUND_UP(15 * crtc_state->linetime, 10) * chroma_downscaling_factor;
> +
> + return latency * intel_crtc_compute_min_cdclk(crtc_state);
As mentioned in previous patch revert to older version.
Other than that patch looks good to me.
Regards,
Ankit
> +}
> +
> static int
> scaler_prefill_latency(const struct intel_crtc_state *crtc_state)
> {
> @@ -2331,10 +2363,10 @@ skl_is_vblank_too_short(const struct intel_crtc_state *crtc_state,
> const struct drm_display_mode *adjusted_mode =
> &crtc_state->hw.adjusted_mode;
>
> - /* FIXME missing scaler and DSC pre-fill time */
> return crtc_state->framestart_delay +
> intel_usecs_to_scanlines(adjusted_mode, latency) +
> scaler_prefill_latency(crtc_state) +
> + dsc_prefill_latency(crtc_state) +
> wm0_lines >
> adjusted_mode->crtc_vtotal - adjusted_mode->crtc_vblank_start;
> }
More information about the Intel-xe
mailing list