On Wed, Sep 11, 2024 at 06:43:44PM +0530, Ankit Nautiyal wrote:
> From: Stanislav Lisovskiy <[email protected]>
>
> Modify the helpers get_primary/secondary_pipes to account for
> ultrajoiner usage. Use the modified helpers to retrieve ultrajoiner
> information in get_joiner_config.
>
> Signed-off-by: Stanislav Lisovskiy <[email protected]>
> Signed-off-by: Ankit Nautiyal <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 57 +++++++++++++-------
> 1 file changed, 37 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 02926a8ef7c5..24698d8ed5d6 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3716,7 +3716,8 @@ static void enabled_ultrajoiner_pipes(struct
> drm_i915_private *i915,
> }
>
> static void enabled_joiner_pipes(struct drm_i915_private *dev_priv,
> - u8 *primary_pipes, u8 *secondary_pipes)
> + u8 *primary_pipes, u8 *secondary_pipes,
> + bool *ultrajoiner_used)
I think life will be simpler if we just pass the current pipe into
enabled_joiner_pipes(), and let it figure out the proper bitmasks
for us.
We should be able to just do somehting like:
if (ultrajoiner_pipes & BIT(pipe)) {
*primary_pipes = BIT(get_primary_pipe(ultrajoiner_primary_pipes, pipe));
*secondary_pipes = ultrajoiner_secondary_pipes &
expected_ultrajoiner_secondary_pipes(*primary_pipes);
return;
}
// same for uncompressed joiner
// same for bigjoiner
to get the approriate primary pipe and secondary pipes for the current
pipe.
> {
> struct intel_display *display = to_intel_display(&dev_priv->drm);
> u8 primary_uncompressed_joiner_pipes, primary_bigjoiner_pipes;
> @@ -3760,6 +3761,7 @@ static void enabled_joiner_pipes(struct
> drm_i915_private *dev_priv,
> secondary_uncompressed_joiner_pipes;
> bigjoiner_pipes = primary_bigjoiner_pipes | secondary_bigjoiner_pipes;
> ultrajoiner_pipes = primary_ultrajoiner_pipes |
> secondary_ultrajoiner_pipes;
> + *ultrajoiner_used = ultrajoiner_pipes != 0;
>
> drm_WARN(display->drm, (uncompressed_joiner_pipes & bigjoiner_pipes) !=
> 0,
> "Uncomressed joiner pipes(%#x) and bigjoiner pipes(%#x) can't
> intersect\n",
> @@ -3794,7 +3796,8 @@ static void enabled_joiner_pipes(struct
> drm_i915_private *dev_priv,
> *primary_pipes, *secondary_pipes);
> }
>
> -static enum pipe get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes,
> u8 secondary_pipes)
> +static enum pipe get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes,
> + u8 secondary_pipes, bool
> ultrajoiner_used)
> {
> if ((secondary_pipes & BIT(pipe)) == 0)
> return pipe;
> @@ -3802,27 +3805,37 @@ static enum pipe get_joiner_primary_pipe(enum pipe
> pipe, u8 primary_pipes, u8 se
> /* ignore everything above our pipe */
> primary_pipes &= ~GENMASK(7, pipe);
>
> - /* highest remaining bit should be our primary pipe */
> - return fls(primary_pipes) - 1;
> + if (!ultrajoiner_used)
> + /* highest remaining bit should be our master pipe */
> + return fls(primary_pipes) - 1;
> +
> + /* lowest remaining bit should be our primary master pipe */
> + return ffs(primary_pipes) - 1;
> }
>
> -static u8 get_joiner_secondary_pipes(enum pipe pipe, u8 primary_pipes, u8
> secondary_pipes)
> +static u8 get_joiner_secondary_pipes(enum pipe pipe, u8 primary_pipes,
> + u8 secondary_pipes, bool ultrajoiner_used)
> {
> enum pipe primary_pipe, next_primary_pipe;
>
> - primary_pipe = get_joiner_primary_pipe(pipe, primary_pipes,
> secondary_pipes);
> + primary_pipe = get_joiner_primary_pipe(pipe, primary_pipes,
> + secondary_pipes,
> ultrajoiner_used);
>
> if ((primary_pipes & BIT(primary_pipe)) == 0)
> return 0;
>
> - /* ignore our primary pipe and everything below it */
> - primary_pipes &= ~GENMASK(primary_pipe, 0);
> - /* make sure a high bit is set for the ffs() */
> - primary_pipes |= BIT(7);
> - /* lowest remaining bit should be the next primary pipe */
> - next_primary_pipe = ffs(primary_pipes) - 1;
> + if (!ultrajoiner_used) {
> + /* ignore our primary pipe and everything below it */
> + primary_pipes &= ~GENMASK(primary_pipe, 0);
> + /* make sure a high bit is set for the ffs() */
> + primary_pipes |= BIT(7);
> + /* lowest remaining bit should be the next primary pipe */
> + next_primary_pipe = ffs(primary_pipes) - 1;
>
> - return secondary_pipes & GENMASK(next_primary_pipe - 1, primary_pipe);
> + return secondary_pipes & GENMASK(next_primary_pipe - 1,
> primary_pipe);
> + } else {
> + return (secondary_pipes | primary_pipes) & ~BIT(primary_pipe);
> + }
> }
>
> static u8 hsw_panel_transcoders(struct drm_i915_private *i915)
> @@ -3843,6 +3856,7 @@ static u8 hsw_enabled_transcoders(struct intel_crtc
> *crtc)
> enum transcoder cpu_transcoder;
> u8 primary_pipes, secondary_pipes;
> u8 enabled_transcoders = 0;
> + bool ultrajoiner_used;
>
> /*
> * XXX: Do intel_display_power_get_if_enabled before reading this (for
> @@ -3893,11 +3907,12 @@ static u8 hsw_enabled_transcoders(struct intel_crtc
> *crtc)
> if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder))
> enabled_transcoders |= BIT(cpu_transcoder);
>
> - /* joiner secondary -> consider the primary pipe's transcoder as well */
> - enabled_joiner_pipes(dev_priv, &primary_pipes, &secondary_pipes);
> + /* joiner slave -> consider the master pipe's transcoder as well */
> + enabled_joiner_pipes(dev_priv, &primary_pipes, &secondary_pipes,
> &ultrajoiner_used);
> if (secondary_pipes & BIT(crtc->pipe)) {
> cpu_transcoder = (enum transcoder)
> - get_joiner_primary_pipe(crtc->pipe, primary_pipes,
> secondary_pipes);
> + get_joiner_primary_pipe(crtc->pipe, primary_pipes,
> + secondary_pipes,
> ultrajoiner_used);
> if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder))
> enabled_transcoders |= BIT(cpu_transcoder);
> }
> @@ -4029,16 +4044,18 @@ static void intel_joiner_get_config(struct
> intel_crtc_state *crtc_state)
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> u8 primary_pipes, secondary_pipes;
> + bool ultrajoiner_used;
> enum pipe pipe = crtc->pipe;
>
> - enabled_joiner_pipes(i915, &primary_pipes, &secondary_pipes);
> + enabled_joiner_pipes(i915, &primary_pipes, &secondary_pipes,
> &ultrajoiner_used);
>
> if (((primary_pipes | secondary_pipes) & BIT(pipe)) == 0)
> return;
>
> - crtc_state->joiner_pipes =
> - BIT(get_joiner_primary_pipe(pipe, primary_pipes,
> secondary_pipes)) |
> - get_joiner_secondary_pipes(pipe, primary_pipes,
> secondary_pipes);
> + crtc_state->joiner_pipes = BIT(get_joiner_primary_pipe(pipe,
> primary_pipes,
> + secondary_pipes,
> ultrajoiner_used)) |
> + get_joiner_secondary_pipes(pipe,
> primary_pipes,
> + secondary_pipes,
> ultrajoiner_used);
> }
>
> static bool hsw_get_pipe_config(struct intel_crtc *crtc,
> --
> 2.45.2
--
Ville Syrjälä
Intel
