> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Ankit
> Nautiyal
> Sent: Thursday, July 18, 2024 1:48 PM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Lisovskiy, Stanislav <stanislav.lisovskiy@xxxxxxxxx>; Saarinen, Jani
> <jani.saarinen@xxxxxxxxx>; ville.syrjala@xxxxxxxxxxxxxxx
> Subject: [PATCH 09/12] drm/i915/display/vdsc: Add ultrajoiner support with
> DSC
>
> From: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
>
> Add changes to DSC which are required for Ultrajoiner.
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_vdsc.c | 26 +++++++++++++++++++++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c
> b/drivers/gpu/drm/i915/display/intel_vdsc.c
> index 11058bb37d5a..815fbffc2d97 100644
> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
> @@ -378,8 +378,11 @@ static int intel_dsc_get_vdsc_per_pipe(const struct
> intel_crtc_state *crtc_state int intel_dsc_get_num_vdsc_instances(const struct
> intel_crtc_state *crtc_state) {
> int num_vdsc_instances = intel_dsc_get_vdsc_per_pipe(crtc_state);
> + int joined_pipes = intel_joiner_num_pipes(crtc_state);
>
> - if (crtc_state->joiner_pipes)
> + if (joined_pipes == 4)
> + num_vdsc_instances *= 4;
> + else if (joined_pipes == 2)
> num_vdsc_instances *= 2;
>
Use enum here as well I think just doing A check of joined pipe no != invalid or none and then num_vdsc_instances *= pipes_joined Would be better.
> return num_vdsc_instances;
> @@ -770,6 +773,13 @@ void intel_uncompressed_joiner_enable(const struct
> intel_crtc_state *crtc_state)
> }
> }
>
> +static bool intel_crtc_ultrajoiner_enable_needed(const struct
> +intel_crtc_state *crtc_state) {
> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> +
> + return intel_joiner_num_pipes(crtc_state) == 4 && crtc->pipe !=
> +PIPE_D; }
> +
Ditto
Regards,
Suraj Kandpal
> void intel_dsc_enable(const struct intel_crtc_state *crtc_state) {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> @@ -789,8 +799,20 @@ void intel_dsc_enable(const struct intel_crtc_state
> *crtc_state)
> dss_ctl1_val |= JOINER_ENABLE;
> }
> if (crtc_state->joiner_pipes) {
> + /*
> + * This bit doesn't seem to follow master/slave logic or
> + * any other logic, so lets just add helper function to
> + * at least hide this hassle..
> + */
> + if (intel_crtc_ultrajoiner_enable_needed(crtc_state))
> + dss_ctl1_val |= ULTRA_JOINER_ENABLE;
> +
> + if (intel_crtc_is_ultrajoiner_primary(crtc_state))
> + dss_ctl1_val |= PRIMARY_ULTRA_JOINER_ENABLE;
> +
> dss_ctl1_val |= BIG_JOINER_ENABLE;
> - if (intel_crtc_is_bigjoiner_primary(crtc_state))
> +
> + if (!intel_crtc_is_joiner_secondary(crtc_state))
> dss_ctl1_val |= PRIMARY_BIG_JOINER_ENABLE;
> }
> intel_de_write(dev_priv, dss_ctl1_reg(crtc, crtc_state->cpu_transcoder),
> dss_ctl1_val);
> --
> 2.45.2
