On Fri, Nov 20, 2020 at 06:01:35PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> If either of the bigjoiner pipes needs a modeset then we need
> a modeset on both pipes. Make it so.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++++--------
> 1 file changed, 24 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 595183f7b60f..321321230a55 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15355,21 +15355,16 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
> return -EINVAL;
> }
>
> -static int kill_bigjoiner_slave(struct intel_atomic_state *state,
> - struct intel_crtc_state *master_crtc_state)
> +static void kill_bigjoiner_slave(struct intel_atomic_state *state,
> + struct intel_crtc_state *master_crtc_state)
> {
> struct intel_crtc_state *slave_crtc_state =
> - intel_atomic_get_crtc_state(&state->base,
> - master_crtc_state->bigjoiner_linked_crtc);
> -
> - if (IS_ERR(slave_crtc_state))
> - return PTR_ERR(slave_crtc_state);
> + intel_atomic_get_new_crtc_state(state, master_crtc_state->bigjoiner_linked_crtc);
Isnt this just a cleanup, doesnt relate to adding linked bigjoiner
pipe to the modeset.
Split this in a separate patch? Or atleast mention this in the commit message
Other than that looks good to me
Manasi
>
> slave_crtc_state->bigjoiner = master_crtc_state->bigjoiner = false;
> slave_crtc_state->bigjoiner_slave = master_crtc_state->bigjoiner_slave = false;
> slave_crtc_state->bigjoiner_linked_crtc = master_crtc_state->bigjoiner_linked_crtc = NULL;
> intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state);
> - return 0;
> }
>
> /**
> @@ -15507,7 +15502,7 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)
>
> static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
> {
> - const struct intel_crtc_state *crtc_state;
> + struct intel_crtc_state *crtc_state;
> struct intel_crtc *crtc;
> int i;
>
> @@ -15521,6 +15516,16 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
> crtc_state->bigjoiner_linked_crtc);
> if (IS_ERR(linked_crtc_state))
> return PTR_ERR(linked_crtc_state);
> +
> + if (needs_modeset(crtc_state))
> + linked_crtc_state->uapi.mode_changed = true;
> + }
> +
> + for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
> + /* Kill old bigjoiner link, we may re-establish afterwards */
> + if (needs_modeset(crtc_state) &&
> + crtc_state->bigjoiner && !crtc_state->bigjoiner_slave)
> + kill_bigjoiner_slave(state, crtc_state);
> }
>
> return 0;
> @@ -15564,13 +15569,6 @@ static int intel_atomic_check(struct drm_device *dev,
> continue;
> }
>
> - /* Kill old bigjoiner link, we may re-establish afterwards */
> - if (old_crtc_state->bigjoiner && !old_crtc_state->bigjoiner_slave) {
> - ret = kill_bigjoiner_slave(state, new_crtc_state);
> - if (ret)
> - goto fail;
> - }
> -
> if (!new_crtc_state->uapi.enable) {
> if (!new_crtc_state->bigjoiner_slave) {
> intel_crtc_copy_uapi_to_hw_state(state, new_crtc_state);
> @@ -15640,6 +15638,16 @@ static int intel_atomic_check(struct drm_device *dev,
> new_crtc_state->update_pipe = false;
> }
> }
> +
> + if (new_crtc_state->bigjoiner) {
> + struct intel_crtc_state *linked_crtc_state =
> + intel_atomic_get_new_crtc_state(state, new_crtc_state->bigjoiner_linked_crtc);
> +
> + if (needs_modeset(linked_crtc_state)) {
> + new_crtc_state->uapi.mode_changed = true;
> + new_crtc_state->update_pipe = false;
> + }
> + }
> }
>
> for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> --
> 2.26.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
