On Tue, Feb 15, 2022 at 08:32:07PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Replace the hardcoded 2 pipe assumptions when we're massaging
> pipe_mode and the pipe_src rect to be suitable for bigjoiner.
> Instead we can just count the number of pipes in the bitmask.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 23 +++++++++++---------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 192474163edb..0690470eab97 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -2727,16 +2727,18 @@ static void intel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state)
> static void intel_bigjoiner_adjust_timings(const struct intel_crtc_state *crtc_state,
> struct drm_display_mode *mode)
> {
> - if (!crtc_state->bigjoiner_pipes)
> + int num_pipes = hweight8(crtc_state->bigjoiner_pipes);
Also just occurred to me that we might want to abstract that a bit
more since it gets repeated in several places. Could be a followup
too I suppose.
> +
> + if (num_pipes < 2)
> return;
>
> - mode->crtc_clock /= 2;
> - mode->crtc_hdisplay /= 2;
> - mode->crtc_hblank_start /= 2;
> - mode->crtc_hblank_end /= 2;
> - mode->crtc_hsync_start /= 2;
> - mode->crtc_hsync_end /= 2;
> - mode->crtc_htotal /= 2;
> + mode->crtc_clock /= num_pipes;
> + mode->crtc_hdisplay /= num_pipes;
> + mode->crtc_hblank_start /= num_pipes;
> + mode->crtc_hblank_end /= num_pipes;
> + mode->crtc_hsync_start /= num_pipes;
> + mode->crtc_hsync_end /= num_pipes;
> + mode->crtc_htotal /= num_pipes;
> }
>
> static void intel_splitter_adjust_timings(const struct intel_crtc_state *crtc_state,
> @@ -2809,16 +2811,17 @@ static void intel_encoder_get_config(struct intel_encoder *encoder,
>
> static void intel_bigjoiner_compute_pipe_src(struct intel_crtc_state *crtc_state)
> {
> + int num_pipes = hweight8(crtc_state->bigjoiner_pipes);
> int width, height;
>
> - if (!crtc_state->bigjoiner_pipes)
> + if (num_pipes < 2)
> return;
>
> width = drm_rect_width(&crtc_state->pipe_src);
> height = drm_rect_height(&crtc_state->pipe_src);
>
> drm_rect_init(&crtc_state->pipe_src, 0, 0,
> - width / 2, height);
> + width / num_pipes, height);
> }
>
> static int intel_crtc_compute_pipe_src(struct intel_crtc_state *crtc_state)
> --
> 2.34.1
--
Ville Syrjälä
Intel
