On Fri, May 14, 2021 at 08:10:15PM -0700, Matt Roper wrote:
> From: Vandita Kulkarni <vandita.kulkarni@xxxxxxxxx>
>
> Add methods to calculate rc parameters for all bpps, against the fixed
> arrays that we already have for 8,10,12 valid o/p bpps, to cover RGB 444
> formats. Our hw doesn't support YUV compression yet. The calculations
> used here are from VESA C model for DSC 1.1
>
> v2:
> - Checkpatch fixes
>
> Cc: Manasi Navare <manasi.d.navare@xxxxxxxxx>
> Cc: Juha-Pekka Heikkil <juha-pekka.heikkila@xxxxxxxxx>
> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@xxxxxxxxx>
> Signed-off-by: Mohammed Khajapasha <mohammed.khajapasha@xxxxxxxxx>
> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
The new RC calculations look good to me and have been verified
Reviewed-by: Manasi Navare <manasi.d.navare@xxxxxxxxx>
Manasi
> ---
> drivers/gpu/drm/i915/display/intel_vdsc.c | 97 ++++++++++++++++++++---
> 1 file changed, 87 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
> index efc3184d8315..02e86d2be395 100644
> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
> @@ -5,7 +5,7 @@
> * Author: Gaurav K Singh <gaurav.k.singh@xxxxxxxxx>
> * Manasi Navare <manasi.d.navare@xxxxxxxxx>
> */
> -
> +#include <linux/limits.h>
> #include "i915_drv.h"
> #include "intel_de.h"
> #include "intel_display_types.h"
> @@ -373,12 +373,74 @@ static bool is_pipe_dsc(const struct intel_crtc_state *crtc_state)
> return true;
> }
>
> +static void
> +calculate_rc_params(struct rc_parameters *rc,
> + struct drm_dsc_config *vdsc_cfg)
> +{
> + int bpc = vdsc_cfg->bits_per_component;
> + int bpp = vdsc_cfg->bits_per_pixel >> 4;
> + int ofs_und6[] = { 0, -2, -2, -4, -6, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12 };
> + int ofs_und8[] = { 2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12 };
> + int ofs_und12[] = { 2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12 };
> + int ofs_und15[] = { 10, 8, 6, 4, 2, 0, -2, -4, -6, -8, -10, -10, -12, -12, -12 };
> + int qp_bpc_modifier = (bpc - 8) * 2;
> + u32 res, buf_i;
> +
> + if (vdsc_cfg->slice_height >= 8)
> + rc->first_line_bpg_offset =
> + 12 + DIV_ROUND_UP((9 * min(34, vdsc_cfg->slice_height - 8)), 100);
> + else
> + rc->first_line_bpg_offset = 2 * (vdsc_cfg->slice_height - 1);
> +
> + /* Our hw supports only 444 modes as of today */
> + if (bpp >= 12)
> + rc->initial_offset = 2048;
> + else if (bpp >= 10)
> + rc->initial_offset = 5632 - DIV_ROUND_UP(((bpp - 10) * 3584), 2);
> + else if (bpp >= 8)
> + rc->initial_offset = 6144 - DIV_ROUND_UP(((bpp - 8) * 512), 2);
> + else
> + rc->initial_offset = 6144;
> +
> + /* initial_xmit_delay = rc_model_size/2/compression_bpp */
> + rc->initial_xmit_delay = DIV_ROUND_UP(DSC_RC_MODEL_SIZE_CONST, 2 * bpp);
> +
> + rc->flatness_min_qp = 3 + qp_bpc_modifier;
> + rc->flatness_max_qp = 12 + qp_bpc_modifier;
> +
> + rc->rc_quant_incr_limit0 = 11 + qp_bpc_modifier;
> + rc->rc_quant_incr_limit1 = 11 + qp_bpc_modifier;
> +
> + for (buf_i = 0; buf_i < DSC_NUM_BUF_RANGES; buf_i++) {
> + /* Calculate range_bgp_offset */
> + if (bpp <= 6) {
> + rc->rc_range_params[buf_i].range_bpg_offset = ofs_und6[buf_i];
> + } else if (bpp <= 8) {
> + res = DIV_ROUND_UP(((bpp - 6) * (ofs_und8[buf_i] - ofs_und6[buf_i])), 2);
> + rc->rc_range_params[buf_i].range_bpg_offset =
> + ofs_und6[buf_i] + res;
> + } else if (bpp <= 12) {
> + rc->rc_range_params[buf_i].range_bpg_offset =
> + ofs_und8[buf_i];
> + } else if (bpp <= 15) {
> + res = DIV_ROUND_UP(((bpp - 12) * (ofs_und15[buf_i] - ofs_und12[buf_i])), 3);
> + rc->rc_range_params[buf_i].range_bpg_offset =
> + ofs_und12[buf_i] + res;
> + } else {
> + rc->rc_range_params[buf_i].range_bpg_offset =
> + ofs_und15[buf_i];
> + }
> + }
> +}
> +
> int intel_dsc_compute_params(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config)
> {
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct drm_dsc_config *vdsc_cfg = &pipe_config->dsc.config;
> u16 compressed_bpp = pipe_config->dsc.compressed_bpp;
> const struct rc_parameters *rc_params;
> + struct rc_parameters *rc = NULL;
> u8 i = 0;
>
> vdsc_cfg->pic_width = pipe_config->hw.adjusted_mode.crtc_hdisplay;
> @@ -413,9 +475,24 @@ int intel_dsc_compute_params(struct intel_encoder *encoder,
> vdsc_cfg->rc_buf_thresh[13] = 0x7D;
> }
>
> - rc_params = get_rc_params(compressed_bpp, vdsc_cfg->bits_per_component);
> - if (!rc_params)
> - return -EINVAL;
> + /*
> + * From XE_LPD onwards we supports compression bpps in steps of 1
> + * upto uncompressed bpp-1, hence add calculations for all the rc
> + * parameters
> + */
> + if (DISPLAY_VER(dev_priv) >= 13) {
> + rc = kmalloc(sizeof(*rc), GFP_KERNEL);
> + if (!rc)
> + return -ENOMEM;
> +
> + calculate_rc_params(rc, vdsc_cfg);
> + rc_params = rc;
> + } else {
> + rc_params = get_rc_params(compressed_bpp,
> + vdsc_cfg->bits_per_component);
> + if (!rc_params)
> + return -EINVAL;
> + }
>
> vdsc_cfg->first_line_bpg_offset = rc_params->first_line_bpg_offset;
> vdsc_cfg->initial_xmit_delay = rc_params->initial_xmit_delay;
> @@ -441,20 +518,20 @@ int intel_dsc_compute_params(struct intel_encoder *encoder,
>
> /*
> * BitsPerComponent value determines mux_word_size:
> - * When BitsPerComponent is 12bpc, muxWordSize will be equal to 64 bits
> - * When BitsPerComponent is 8 or 10bpc, muxWordSize will be equal to
> - * 48 bits
> + * When BitsPerComponent is less than or 10bpc, muxWordSize will be equal to
> + * 48 bits otherwise 64
> */
> - if (vdsc_cfg->bits_per_component == 8 ||
> - vdsc_cfg->bits_per_component == 10)
> + if (vdsc_cfg->bits_per_component <= 10)
> vdsc_cfg->mux_word_size = DSC_MUX_WORD_SIZE_8_10_BPC;
> - else if (vdsc_cfg->bits_per_component == 12)
> + else
> vdsc_cfg->mux_word_size = DSC_MUX_WORD_SIZE_12_BPC;
>
> /* InitialScaleValue is a 6 bit value with 3 fractional bits (U3.3) */
> vdsc_cfg->initial_scale_value = (vdsc_cfg->rc_model_size << 3) /
> (vdsc_cfg->rc_model_size - vdsc_cfg->initial_offset);
>
> + kfree(rc);
> +
> return 0;
> }
>
> --
> 2.25.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
