Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcb877b7 authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark
Browse files

drm/msm/mdp5: Add more stuff to CRTC state 



Things like vblank/err irq masks, mode of operation (command mode or not)
are derivative of the interface and mixer state. Therefore, they need to
be a part of the CRTC state too.

Add them to mdp5_crtc_state, and assign them in the CRTC's atomic_check()
func, so that it can be rolled back to a clean state.

Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 502e3550

drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

+19 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ int mdp5_crtc_setup_pipeline(struct drm_crtc *crtc, 
	struct mdp5_crtc_state *mdp5_cstate =

			to_mdp5_crtc_state(new_crtc_state);

	struct mdp5_pipeline *pipeline = &mdp5_cstate->pipeline;

	struct mdp5_interface *intf;

	bool new_mixer = false;



	new_mixer = !pipeline->mixer;
@@ -388,6 +389,24 @@ int mdp5_crtc_setup_pipeline(struct drm_crtc *crtc, 
		mdp5_mixer_release(new_crtc_state->state, old_mixer);

	}



	/*

	 * these should have been already set up in the encoder's atomic

	 * check (called by drm_atomic_helper_check_modeset)

	 */

	intf = pipeline->intf;



	mdp5_cstate->err_irqmask = intf2err(intf->num);

	mdp5_cstate->vblank_irqmask = intf2vblank(pipeline->mixer, intf);



	if ((intf->type == INTF_DSI) &&

	    (intf->mode == MDP5_INTF_DSI_MODE_COMMAND)) {

		mdp5_cstate->pp_done_irqmask = lm2ppdone(pipeline->mixer);

		mdp5_cstate->cmd_mode = true;

	} else {

		mdp5_cstate->pp_done_irqmask = 0;

		mdp5_cstate->cmd_mode = false;

	}



	return 0;

}

drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,13 @@ struct mdp5_crtc_state { 


	struct mdp5_ctl *ctl;

	struct mdp5_pipeline pipeline;



	/* these are derivatives of intf/mixer state in mdp5_pipeline */

	u32 vblank_irqmask;

	u32 err_irqmask;

	u32 pp_done_irqmask;



	bool cmd_mode;

};

#define to_mdp5_crtc_state(x) \

		container_of(x, struct mdp5_crtc_state, base)