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

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

drm/msm/mdp5: subclass CRTC state 



Subclass drm_crtc_state so that we can maintain additional state for
our CRTCs.

Add mdp5_pipeline and mdp5_ctl pointers in the subclassed state.
mdp5_pipeline is a grouping of the HW entities that forms the downstream
pipeline for a particular CRTC. It currently contains pointers to
mdp5_interface and mdp5_hw_mixer tied to this CRTC. Later, we will
have 2 hwmixers in this struct. (We could also have 2 intfs if we want
to support dual DSI with Source Split enabled. Implementing that feature
isn't planned at the moment).

The mdp5_pipeline state isn't used at the moment. For now, we just
introduce mdp5_crtc_state and the crtc funcs needed to manage the
subclassed state.

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

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

+66 −6
Original line number Diff line number Diff line
@@ -639,16 +639,75 @@ static int mdp5_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) 
	return 0;

}



static void

mdp5_crtc_atomic_print_state(struct drm_printer *p,

			     const struct drm_crtc_state *state)

{

	struct mdp5_crtc_state *mdp5_cstate = to_mdp5_crtc_state(state);

	struct mdp5_pipeline *pipeline = &mdp5_cstate->pipeline;



	if (WARN_ON(!pipeline))

		return;



	drm_printf(p, "\thwmixer=%s\n", pipeline->mixer ?

			pipeline->mixer->name : "(null)");

}



static void mdp5_crtc_reset(struct drm_crtc *crtc)

{

	struct mdp5_crtc_state *mdp5_cstate;



	if (crtc->state) {

		__drm_atomic_helper_crtc_destroy_state(crtc->state);

		kfree(to_mdp5_crtc_state(crtc->state));

	}



	mdp5_cstate = kzalloc(sizeof(*mdp5_cstate), GFP_KERNEL);



	if (mdp5_cstate) {

		mdp5_cstate->base.crtc = crtc;

		crtc->state = &mdp5_cstate->base;

	}

}



static struct drm_crtc_state *

mdp5_crtc_duplicate_state(struct drm_crtc *crtc)

{

	struct mdp5_crtc_state *mdp5_cstate;



	if (WARN_ON(!crtc->state))

		return NULL;



	mdp5_cstate = kmemdup(to_mdp5_crtc_state(crtc->state),

			      sizeof(*mdp5_cstate), GFP_KERNEL);

	if (!mdp5_cstate)

		return NULL;



	__drm_atomic_helper_crtc_duplicate_state(crtc, &mdp5_cstate->base);



	return &mdp5_cstate->base;

}



static void mdp5_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state)

{

	struct mdp5_crtc_state *mdp5_cstate = to_mdp5_crtc_state(state);



	__drm_atomic_helper_crtc_destroy_state(state);



	kfree(mdp5_cstate);

}



static const struct drm_crtc_funcs mdp5_crtc_funcs = {

	.set_config = drm_atomic_helper_set_config,

	.destroy = mdp5_crtc_destroy,

	.page_flip = drm_atomic_helper_page_flip,

	.set_property = drm_atomic_helper_crtc_set_property,

	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.reset = mdp5_crtc_reset,

	.atomic_duplicate_state = mdp5_crtc_duplicate_state,

	.atomic_destroy_state = mdp5_crtc_destroy_state,

	.cursor_set = mdp5_crtc_cursor_set,

	.cursor_move = mdp5_crtc_cursor_move,

	.atomic_print_state = mdp5_crtc_atomic_print_state,

};



static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = {
@@ -656,9 +715,10 @@ static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { 
	.destroy = mdp5_crtc_destroy,

	.page_flip = drm_atomic_helper_page_flip,

	.set_property = drm_atomic_helper_crtc_set_property,

	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.reset = mdp5_crtc_reset,

	.atomic_duplicate_state = mdp5_crtc_duplicate_state,

	.atomic_destroy_state = mdp5_crtc_destroy_state,

	.atomic_print_state = mdp5_crtc_atomic_print_state,

};



static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = {

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

+14 −0
Original line number Diff line number Diff line
@@ -115,6 +115,20 @@ struct mdp5_plane_state { 
#define to_mdp5_plane_state(x) \

		container_of(x, struct mdp5_plane_state, base)



struct mdp5_pipeline {

	struct mdp5_interface *intf;

	struct mdp5_hw_mixer *mixer;

};



struct mdp5_crtc_state {

	struct drm_crtc_state base;



	struct mdp5_ctl *ctl;

	struct mdp5_pipeline pipeline;

};

#define to_mdp5_crtc_state(x) \

		container_of(x, struct mdp5_crtc_state, base)



enum mdp5_intf_mode {

	MDP5_INTF_MODE_NONE = 0,