On Wed, Sep 11, 2024 at 06:43:41PM +0530, Ankit Nautiyal wrote: > From: Stanislav Lisovskiy <[email protected]> > > We need to add a new sanity checks and also do > some preparations for adding ultrajoiner hw state readout. > Lets first split reading of the uncompressed joiner and bigjoiner > bit masks into separate functions. > > v2: Fixed checkpatch warnings (Ankit) > v3: Use struct intel_display in the new functions. (Ankit) > > Signed-off-by: Stanislav Lisovskiy <[email protected]> > Signed-off-by: Ankit Nautiyal <[email protected]> > Reviewed-by: Suraj Kandpal <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 75 ++++++++++++++------ > 1 file changed, 55 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 248ad63b0ba8..e93af02aa859 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -3582,27 +3582,54 @@ static bool intel_display_can_use_joiner(struct > intel_display *display) > return (DISPLAY_VER(display) >= 11); > } > > -static void enabled_joiner_pipes(struct drm_i915_private *dev_priv, > - u8 *primary_pipes, u8 *secondary_pipes) > +static void enabled_uncompressed_joiner_pipes(struct intel_display *display, > + u8 *primary_pipes, u8 > *secondary_pipes) > { > - struct intel_display *display = to_intel_display(&dev_priv->drm); > + struct drm_i915_private *i915 = to_i915(display->drm); > struct intel_crtc *crtc; > > *primary_pipes = 0; > *secondary_pipes = 0; > > - if (!intel_display_can_use_joiner(display)) > + if (DISPLAY_VER(display) < 13) > return; > > - for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, > - joiner_pipes(dev_priv)) { > + 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(dev_priv, power_domain, > wakeref) { > - u32 tmp = intel_de_read(dev_priv, > ICL_PIPE_DSS_CTL1(pipe)); > + power_domain = POWER_DOMAIN_PIPE(pipe); > + with_intel_display_power_if_enabled(i915, power_domain, > wakeref) { > + u32 tmp = intel_de_read(display, > ICL_PIPE_DSS_CTL1(pipe)); > + > + if (tmp & UNCOMPRESSED_JOINER_PRIMARY) > + *primary_pipes |= BIT(pipe); > + if (tmp & UNCOMPRESSED_JOINER_SECONDARY) > + *secondary_pipes |= BIT(pipe); > + } > + } > +} > + > +static void enabled_bigjoiner_pipes(struct intel_display *display, > + u8 *primary_pipes, u8 *secondary_pipes) > +{ > + struct drm_i915_private *i915 = to_i915(display->drm); > + struct intel_crtc *crtc; > + > + *primary_pipes = 0; > + *secondary_pipes = 0; > + > + 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(display, > ICL_PIPE_DSS_CTL1(pipe)); > > if (!(tmp & BIG_JOINER_ENABLE)) > continue; > @@ -3612,20 +3639,28 @@ static void enabled_joiner_pipes(struct > drm_i915_private *dev_priv, > else > *secondary_pipes |= BIT(pipe); > } > + } > +} > > - if (DISPLAY_VER(dev_priv) < 13) > - continue; > +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 secondary_uncompressed_joiner_pipes, secondary_bigjoiner_pipes; > > - power_domain = POWER_DOMAIN_PIPE(pipe); > - with_intel_display_power_if_enabled(dev_priv, power_domain, > wakeref) { > - u32 tmp = intel_de_read(dev_priv, > ICL_PIPE_DSS_CTL1(pipe)); > + if (!intel_display_can_use_joiner(display)) > + return;
I think we should just have the check in enabled_bigjoiner_pipes() and this function shouldn't really have to care whether joiners are supported or not (or which types are supported). > > - if (tmp & UNCOMPRESSED_JOINER_PRIMARY) > - *primary_pipes |= BIT(pipe); > - if (tmp & UNCOMPRESSED_JOINER_SECONDARY) > - *secondary_pipes |= BIT(pipe); > - } > - } > + enabled_uncompressed_joiner_pipes(display, > &primary_uncompressed_joiner_pipes, > + &secondary_uncompressed_joiner_pipes); > + > + enabled_bigjoiner_pipes(display, &primary_bigjoiner_pipes, > + &secondary_bigjoiner_pipes); > + > + *primary_pipes = primary_uncompressed_joiner_pipes | > primary_bigjoiner_pipes; > + > + *secondary_pipes = secondary_uncompressed_joiner_pipes | > secondary_bigjoiner_pipes; > > /* Joiner pipes should always be consecutive primary and secondary */ > drm_WARN(&dev_priv->drm, *secondary_pipes != *primary_pipes << 1, > -- > 2.45.2 -- Ville Syrjälä Intel
