Commit 412b1e46 authored by Yongqiang Niu's avatar Yongqiang Niu Committed by CK Hu
Browse files

drm/mediatek: add ovl0/ovl_2l0 usecase 



This patch add ovl0/ovl_2l0 usecase
in ovl->ovl_2l0 direct link usecase:
1. the crtc support layer number will 4+2
2. ovl_2l0 background color input select ovl0 when crtc init
and disable it when crtc finish
3. config ovl_2l0 layer, if crtc config layer number is
bigger than ovl0 support layers(max is 4)

Signed-off-by: default avatarYongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
parent 57148baa

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+34 −3
Original line number Diff line number Diff line
@@ -272,6 +272,9 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {

		struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[i];



		if (i == 1)

			mtk_ddp_comp_bgclr_in_on(comp);



		mtk_ddp_comp_config(comp, width, height, vrefresh, bpc);

		mtk_ddp_comp_start(comp);

	}
@@ -280,9 +283,18 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
	for (i = 0; i < mtk_crtc->layer_nr; i++) {

		struct drm_plane *plane = &mtk_crtc->planes[i];

		struct mtk_plane_state *plane_state;

		struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];

		unsigned int comp_layer_nr = mtk_ddp_comp_layer_nr(comp);

		unsigned int local_layer;



		plane_state = to_mtk_plane_state(plane->state);

		mtk_ddp_comp_layer_config(mtk_crtc->ddp_comp[0], i,



		if (i >= comp_layer_nr) {

			comp = mtk_crtc->ddp_comp[1];

			local_layer = i - comp_layer_nr;

		} else

			local_layer = i;

		mtk_ddp_comp_layer_config(comp, local_layer,

					  plane_state);

	}
@@ -301,8 +313,12 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) 
	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);

	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)

	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {

		mtk_ddp_comp_stop(mtk_crtc->ddp_comp[i]);

		if (i == 1)

			mtk_ddp_comp_bgclr_in_off(mtk_crtc->ddp_comp[i]);

	}



	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)

		mtk_disp_mutex_remove_comp(mtk_crtc->mutex,

					   mtk_crtc->ddp_comp[i]->id);
@@ -327,6 +343,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) 
	struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];

	unsigned int i;

	unsigned int comp_layer_nr = mtk_ddp_comp_layer_nr(comp);

	unsigned int local_layer;



	/*

	 * TODO: instead of updating the registers here, we should prepare
@@ -349,7 +367,14 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc) 
			plane_state = to_mtk_plane_state(plane->state);



			if (plane_state->pending.config) {

				mtk_ddp_comp_layer_config(comp, i, plane_state);

				if (i >= comp_layer_nr) {

					comp = mtk_crtc->ddp_comp[1];

					local_layer = i - comp_layer_nr;

				} else

					local_layer = i;



				mtk_ddp_comp_layer_config(comp, local_layer,

							  plane_state);

				plane_state->pending.config = false;

			}

		}
@@ -582,6 +607,12 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
	}



	mtk_crtc->layer_nr = mtk_ddp_comp_layer_nr(mtk_crtc->ddp_comp[0]);

	if (mtk_crtc->ddp_comp_nr > 1) {

		struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[1];



		if (comp->funcs->bgclr_in_on)

			mtk_crtc->layer_nr += mtk_ddp_comp_layer_nr(comp);

	}

	mtk_crtc->planes = devm_kcalloc(dev, mtk_crtc->layer_nr,

					sizeof(struct drm_plane),

					GFP_KERNEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE