[PATCH 05/14] drm/i915: Add some essential functionality for joiners
Nautiyal, Ankit K
ankit.k.nautiyal at intel.com
Mon Sep 9 07:47:00 UTC 2024
On 9/6/2024 8:54 PM, Ville Syrjälä wrote:
> On Fri, Sep 06, 2024 at 06:27:58PM +0530, Ankit Nautiyal wrote:
>> From: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
>>
>> In most of the cases we now try to avoid mentioning things like
>> "bigjoiner" or "ultrajoiner" trying to unify the API and refer
>> mostly to all this functionality as "joiner".
>> In majority cases that should be way to go.
>> However in some cases we still need to distinguish between
>> bigjoiner primaries and secondaries(such as DSC register programming).
>>
>> Create correspondent helper functions and start using them,
>> in order be prepared for adding ultrajoiner functionality.
>>
>> v2: Fixed checkpatch warnings (Ankit)
>> v3: Introduce ultrajoiner helpers in next patch.
>>
>> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>
>> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
>> ---
>> .../gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_display.c | 52 +++++++++++++++++--
>> drivers/gpu/drm/i915/display/intel_display.h | 6 ++-
>> .../drm/i915/display/intel_modeset_verify.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +-
>> 5 files changed, 56 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
>> index 928d985f9985..83ed018b1735 100644
>> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
>> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
>> @@ -725,7 +725,7 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
>>
>> if (new_crtc_state && intel_crtc_is_joiner_secondary(new_crtc_state)) {
>> struct intel_crtc *primary_crtc =
>> - intel_primary_crtc(new_crtc_state);
>> + intel_joiner_primary_crtc(new_crtc_state);
>> struct intel_plane *primary_crtc_plane =
>> intel_crtc_get_plane(primary_crtc, plane->id);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 257e479310c2..3278debf47cc 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -254,6 +254,50 @@ static enum pipe joiner_primary_pipe(const struct intel_crtc_state *crtc_state)
>> return ffs(crtc_state->joiner_pipes) - 1;
>> }
>>
>> +static bool intel_is_joiner(const struct intel_crtc_state *crtc_state)
>> +{
>> + return intel_joiner_num_pipes(crtc_state) > 1;
>> +}
>> +
>> +static u8 bigjoiner_primary_pipes(const struct intel_crtc_state *crtc_state)
>> +{
>> + int lsb = ffs(crtc_state->joiner_pipes) - 1;
>> + int msb = fls(crtc_state->joiner_pipes) - 1;
>> + int i;
>> + u8 bigjoiner_primary_mask = 0;
>> +
>> + for (i = lsb; i < msb; i += 4) {
>> + /*
>> + * Regardless of how joiner_pipes mask is set, currently
>> + * we always assume, that primary pipe bit goes before secondary
>> + * pipe bit. So in each set of 2 bits, least significant bit is
>> + * bigjoiner primary pipe and most significant bit is secondary pipe.
>> + */
>> + bigjoiner_primary_mask |=
>> + ((BIT(0) | BIT(2)) << i) & crtc_state->joiner_pipes;
>> + }
>> +
>> + return bigjoiner_primary_mask;
> This seems needlessly complicated.
>
> Something like this?
>
> return crtc_state->joiner_pipes & (0b01010101 << joiner_primary_pipe(crtc_state))
Yeah makes sense, will remove the loop and use this.
>
>> +}
>> +
>> +bool intel_crtc_is_bigjoiner_primary(const struct intel_crtc_state *crtc_state)
>> +{
>> + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
>> +
>> + if (!intel_is_joiner(crtc_state))
>> + return false;
>> +
>> + return BIT(crtc->pipe) & bigjoiner_primary_pipes(crtc_state);
>> +}
>> +
>> +bool intel_crtc_is_bigjoiner_secondary(const struct intel_crtc_state *crtc_state)
>> +{
>> + if (!intel_is_joiner(crtc_state))
>> + return false;
>> +
>> + return !intel_crtc_is_bigjoiner_primary(crtc_state);
>> +}
>> +
>> u8 intel_crtc_joiner_secondary_pipes(const struct intel_crtc_state *crtc_state)
>> {
>> if (crtc_state->joiner_pipes)
>> @@ -290,7 +334,7 @@ u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state *crtc_state)
>> return BIT(crtc->pipe) | crtc_state->joiner_pipes;
>> }
>>
>> -struct intel_crtc *intel_primary_crtc(const struct intel_crtc_state *crtc_state)
>> +struct intel_crtc *intel_joiner_primary_crtc(const struct intel_crtc_state *crtc_state)
>> {
>> struct intel_display *display = to_intel_display(crtc_state);
>>
>> @@ -810,7 +854,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,
>> int num_encoders = 0;
>> int i;
>>
>> - primary_crtc = intel_primary_crtc(crtc_state);
>> + primary_crtc = intel_joiner_primary_crtc(crtc_state);
> That rename seems unrelated to the rest of the patch.
I can have it in separate patch.
Regards,
Ankit
>
>>
>> for_each_new_connector_in_state(&state->base, connector, connector_state, i) {
>> if (connector_state->crtc != &primary_crtc->base)
>> @@ -4530,7 +4574,7 @@ copy_joiner_crtc_state_nomodeset(struct intel_atomic_state *state,
>> {
>> struct intel_crtc_state *secondary_crtc_state =
>> intel_atomic_get_new_crtc_state(state, secondary_crtc);
>> - struct intel_crtc *primary_crtc = intel_primary_crtc(secondary_crtc_state);
>> + struct intel_crtc *primary_crtc = intel_joiner_primary_crtc(secondary_crtc_state);
>> const struct intel_crtc_state *primary_crtc_state =
>> intel_atomic_get_new_crtc_state(state, primary_crtc);
>>
>> @@ -4550,7 +4594,7 @@ copy_joiner_crtc_state_modeset(struct intel_atomic_state *state,
>> {
>> struct intel_crtc_state *secondary_crtc_state =
>> intel_atomic_get_new_crtc_state(state, secondary_crtc);
>> - struct intel_crtc *primary_crtc = intel_primary_crtc(secondary_crtc_state);
>> + struct intel_crtc *primary_crtc = intel_joiner_primary_crtc(secondary_crtc_state);
>> const struct intel_crtc_state *primary_crtc_state =
>> intel_atomic_get_new_crtc_state(state, primary_crtc);
>> struct intel_crtc_state *saved_state;
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
>> index c0f8bb7e5095..840a98947de8 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display.h
>> @@ -424,10 +424,12 @@ enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);
>> bool is_trans_port_sync_mode(const struct intel_crtc_state *state);
>> bool is_trans_port_sync_master(const struct intel_crtc_state *state);
>> u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state *crtc_state);
>> -bool intel_crtc_is_joiner_secondary(const struct intel_crtc_state *crtc_state);
>> bool intel_crtc_is_joiner_primary(const struct intel_crtc_state *crtc_state);
>> +bool intel_crtc_is_joiner_secondary(const struct intel_crtc_state *crtc_state);
>> +bool intel_crtc_is_bigjoiner_primary(const struct intel_crtc_state *crtc_state);
>> +bool intel_crtc_is_bigjoiner_secondary(const struct intel_crtc_state *crtc_state);
>> u8 intel_crtc_joiner_secondary_pipes(const struct intel_crtc_state *crtc_state);
>> -struct intel_crtc *intel_primary_crtc(const struct intel_crtc_state *crtc_state);
>> +struct intel_crtc *intel_joiner_primary_crtc(const struct intel_crtc_state *crtc_state);
>> bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state);
>> bool intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>> const struct intel_crtc_state *pipe_config,
>> diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
>> index 3491db5cad31..b53b810c6470 100644
>> --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c
>> +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
>> @@ -193,7 +193,7 @@ verify_crtc_state(struct intel_atomic_state *state,
>> "transitional active state does not match atomic hw state (expected %i, found %i)\n",
>> sw_crtc_state->hw.active, crtc->active);
>>
>> - primary_crtc = intel_primary_crtc(sw_crtc_state);
>> + primary_crtc = intel_joiner_primary_crtc(sw_crtc_state);
>>
>> for_each_encoder_on_crtc(dev, &primary_crtc->base, encoder) {
>> enum pipe pipe;
>> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
>> index 2e849b015e74..8158e3702ed5 100644
>> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
>> @@ -742,7 +742,7 @@ void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state)
>> u32 dss_ctl1_val = 0;
>>
>> if (crtc_state->joiner_pipes && !crtc_state->dsc.compression_enable) {
>> - if (intel_crtc_is_joiner_secondary(crtc_state))
>> + if (intel_crtc_is_bigjoiner_secondary(crtc_state))
>> dss_ctl1_val |= UNCOMPRESSED_JOINER_SECONDARY;
>> else
>> dss_ctl1_val |= UNCOMPRESSED_JOINER_PRIMARY;
>> @@ -771,7 +771,7 @@ void intel_dsc_enable(const struct intel_crtc_state *crtc_state)
>> }
>> if (crtc_state->joiner_pipes) {
>> dss_ctl1_val |= BIG_JOINER_ENABLE;
>> - if (!intel_crtc_is_joiner_secondary(crtc_state))
>> + if (intel_crtc_is_bigjoiner_primary(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
More information about the Intel-gfx
mailing list