On Wed, Sep 18, 2024 at 08:13:38PM +0530, Ankit Nautiyal wrote: > From: Stanislav Lisovskiy <[email protected]> > > Ultrajoiner mode has some new bits and states to be > read out from the hw. Lets make changes accordingly. > > v2: Fix checkpatch warnings. (Ankit) > v3: Add separate functions for computing expected secondary_big/ultrajoiner > pipes. (Ankit) > v4: > -Streamline the helpers for ultrajoiner. (Ville) > -Add fixup to accommodate PIPED check for ultrajoiner. (Ville) > -Add more Ultrajoiner drm_WARNs. (Ville) > v5: Remove spurious newline. (Ville) > > Signed-off-by: Stanislav Lisovskiy <[email protected]> > Signed-off-by: Ankit Nautiyal <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 81 +++++++++++++++++-- > .../gpu/drm/i915/display/intel_vdsc_regs.h | 2 + > 2 files changed, 78 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index a17e89fb5eb9..1ce334f3a3ae 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -3674,13 +3674,58 @@ static u8 expected_bigjoiner_secondary_pipes(u8 > bigjoiner_primary_pipes) > return expected_secondary_pipes(bigjoiner_primary_pipes, 2); > } > > +static u8 expected_ultrajoiner_secondary_pipes(u8 ultrajoiner_primary_pipes) > +{ > + return expected_secondary_pipes(ultrajoiner_primary_pipes, 4); > +} > + > +static u8 fixup_ultrajoiner_secondary_pipes(u8 ultrajoiner_primary_pipes, > + u8 ultrajoiner_secondary_pipes) > +{ > + return ultrajoiner_secondary_pipes | ultrajoiner_primary_pipes << 3; > +} > + > +static void enabled_ultrajoiner_pipes(struct drm_i915_private *i915, > + u8 *primary_pipes, u8 *secondary_pipes) > +{ > + struct intel_crtc *crtc; > + > + *primary_pipes = 0; > + *secondary_pipes = 0; > + > + if (!HAS_ULTRAJOINER(i915)) > + return; > + > + for_each_intel_crtc_in_pipe_mask(&i915->drm, crtc, > + joiner_pipes(i915)) { > + enum intel_display_power_domain power_domain; > + enum pipe pipe = crtc->pipe; > + intel_wakeref_t wakeref; > + > + power_domain = intel_dsc_power_domain(crtc, (enum > transcoder)pipe); > + with_intel_display_power_if_enabled(i915, power_domain, > wakeref) { > + u32 tmp = intel_de_read(i915, ICL_PIPE_DSS_CTL1(pipe)); > + > + if (!(tmp & ULTRA_JOINER_ENABLE)) > + continue; > + > + if (tmp & PRIMARY_ULTRA_JOINER_ENABLE) > + *primary_pipes |= BIT(pipe); > + else > + *secondary_pipes |= BIT(pipe); > + } > + } > +} > + > static void enabled_joiner_pipes(struct drm_i915_private *dev_priv, > u8 *primary_pipes, u8 *secondary_pipes) > { > struct intel_display *display = to_intel_display(&dev_priv->drm); > u8 primary_uncompressed_joiner_pipes, primary_bigjoiner_pipes; > + u8 primary_ultrajoiner_pipes; > u8 secondary_uncompressed_joiner_pipes, secondary_bigjoiner_pipes; > - u8 uncompressed_joiner_pipes, bigjoiner_pipes; > + u8 secondary_ultrajoiner_pipes; > + u8 uncompressed_joiner_pipes, bigjoiner_pipes, ultrajoiner_pipes; > > enabled_uncompressed_joiner_pipes(display, > &primary_uncompressed_joiner_pipes, > &secondary_uncompressed_joiner_pipes); > @@ -3694,13 +3739,33 @@ static void enabled_joiner_pipes(struct > drm_i915_private *dev_priv, > drm_WARN_ON(display->drm, > (primary_bigjoiner_pipes & secondary_bigjoiner_pipes) != 0); > > + enabled_ultrajoiner_pipes(dev_priv, &primary_ultrajoiner_pipes, > + &secondary_ultrajoiner_pipes); > + /* > + * For some strange reason the last pipe in the set of four > + * shouldn't have ultrajoiner enable bit set in hardware. > + * Set the bit anyway to make life easier. > + */ > + drm_WARN_ON(&dev_priv->drm, > + expected_secondary_pipes(primary_ultrajoiner_pipes, 3) != > + secondary_ultrajoiner_pipes); > + secondary_ultrajoiner_pipes = > + fixup_ultrajoiner_secondary_pipes(primary_ultrajoiner_pipes, > + secondary_ultrajoiner_pipes); > + > + drm_WARN_ON(&dev_priv->drm, (primary_ultrajoiner_pipes & > secondary_ultrajoiner_pipes) != 0); > + > uncompressed_joiner_pipes = primary_uncompressed_joiner_pipes | > secondary_uncompressed_joiner_pipes; > bigjoiner_pipes = primary_bigjoiner_pipes | secondary_bigjoiner_pipes; > + ultrajoiner_pipes = primary_ultrajoiner_pipes | > secondary_ultrajoiner_pipes; > > drm_WARN(display->drm, (uncompressed_joiner_pipes & bigjoiner_pipes) != > 0, > "Uncomressed joiner pipes(%#x) and bigjoiner pipes(%#x) can't > intersect\n", > uncompressed_joiner_pipes, bigjoiner_pipes); > + drm_WARN(display->drm, (ultrajoiner_pipes & bigjoiner_pipes) != > ultrajoiner_pipes, > + "Ultrajoiner pipes(%#x) should be bigjoiner pipes(%#x)\n", > + ultrajoiner_pipes, bigjoiner_pipes); > drm_WARN(display->drm, secondary_bigjoiner_pipes != > expected_bigjoiner_secondary_pipes(primary_bigjoiner_pipes), > "Wrong secondary bigjoiner pipes(expected %#x, current %#x)\n", > @@ -3711,10 +3776,16 @@ static void enabled_joiner_pipes(struct > drm_i915_private *dev_priv, > "Wrong secondary uncompressed joiner pipes(expected %#x, > current %#x)\n", > > expected_uncompjoiner_secondary_pipes(primary_uncompressed_joiner_pipes), > secondary_uncompressed_joiner_pipes); > - > - *primary_pipes = primary_uncompressed_joiner_pipes | > primary_bigjoiner_pipes; > - > - *secondary_pipes = secondary_uncompressed_joiner_pipes | > secondary_bigjoiner_pipes; > + drm_WARN(display->drm, secondary_ultrajoiner_pipes != > + > expected_ultrajoiner_secondary_pipes(primary_ultrajoiner_pipes), > + "Wrong secondary ultrajoiner pipes(expected %x, current %x)\n", > + > expected_ultrajoiner_secondary_pipes(primary_ultrajoiner_pipes), > + secondary_ultrajoiner_pipes); > + > + *primary_pipes = primary_uncompressed_joiner_pipes | > primary_bigjoiner_pipes | > + primary_ultrajoiner_pipes; > + *secondary_pipes = secondary_uncompressed_joiner_pipes | > secondary_bigjoiner_pipes | > + secondary_ultrajoiner_pipes; > > /* Joiner pipes should always be consecutive primary and secondary */ > drm_WARN(display->drm, *secondary_pipes != *primary_pipes << 1,
This stuff will now be wrong. I think we need to update the logic to that constructs the final primary_pipes and secondary_pipes first. Which I think is in the next patch, I'll comment there some more. > diff --git a/drivers/gpu/drm/i915/display/intel_vdsc_regs.h > b/drivers/gpu/drm/i915/display/intel_vdsc_regs.h > index f921ad67b587..bf32a3b46fb1 100644 > --- a/drivers/gpu/drm/i915/display/intel_vdsc_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_vdsc_regs.h > @@ -37,6 +37,8 @@ > #define SPLITTER_CONFIGURATION_MASK REG_GENMASK(26, 25) > #define SPLITTER_CONFIGURATION_2_SEGMENT > REG_FIELD_PREP(SPLITTER_CONFIGURATION_MASK, 0) > #define SPLITTER_CONFIGURATION_4_SEGMENT > REG_FIELD_PREP(SPLITTER_CONFIGURATION_MASK, 1) > +#define ULTRA_JOINER_ENABLE REG_BIT(23) > +#define PRIMARY_ULTRA_JOINER_ENABLE REG_BIT(22) > #define UNCOMPRESSED_JOINER_PRIMARY (1 << 21) > #define UNCOMPRESSED_JOINER_SECONDARY (1 << 20) > > -- > 2.45.2 -- Ville Syrjälä Intel
