Commit 01389b32 authored by Jason-JH.Lin's avatar Jason-JH.Lin Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add connector dynamic selection capability 



Add dynamic select available connector flow in mtk_drm_crtc_create()
and mtk_drm_crtc_atomic_enable().

In mtk_drm_crtc_create(), if there is a connector routes array in drm
driver data, all components definded in the connector routes array will
be checked and their encoder_index will be set.

In mtk_drm_crtc_atomic_enable(), crtc will check its encoder_index to
identify which componet in the connector routes array should append.

Signed-off-by: default avatarJason-JH.Lin <jason-jh.lin@mediatek.com>
Signed-off-by: default avatarNancy Lin <nancy.lin@mediatek.com>
Signed-off-by: default avatarNathan Lu <nathan.lu@mediatek.com>
Tested-by: default avatarFei Shao <fshao@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20231004024013.18956-6-jason-jh.lin@mediatek.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent a260f562

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+70 −2
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ struct mtk_drm_crtc { 
	struct mtk_mutex		*mutex;

	unsigned int			ddp_comp_nr;

	struct mtk_ddp_comp		**ddp_comp;

	unsigned int			num_conn_routes;

	const struct mtk_drm_route	*conn_routes;



	/* lock for display hardware access */

	struct mutex			hw_lock;
@@ -647,6 +649,43 @@ static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc) 
	mtk_ddp_comp_disable_vblank(comp);

}



static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,

				       struct drm_atomic_state *state)

{

	int crtc_index = drm_crtc_index(crtc);

	int i;

	struct device *dev;

	struct drm_crtc_state *crtc_state = state->crtcs[crtc_index].new_state;

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_drm_private *priv;

	unsigned int encoder_mask = crtc_state->encoder_mask;



	if (!crtc_state->connectors_changed)

		return;



	if (!mtk_crtc->num_conn_routes)

		return;



	priv = ((struct mtk_drm_private *)crtc->dev->dev_private)->all_drm_private[crtc_index];

	dev = priv->dev;



	dev_dbg(dev, "connector change:%d, encoder mask:0x%x for crtc:%d\n",

		crtc_state->connectors_changed, encoder_mask, crtc_index);



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

		unsigned int comp_id = mtk_crtc->conn_routes[i].route_ddp;

		struct mtk_ddp_comp *comp = &priv->ddp_comp[comp_id];



		if (comp->encoder_index >= 0 &&

		    (encoder_mask & BIT(comp->encoder_index))) {

			mtk_crtc->ddp_comp[mtk_crtc->ddp_comp_nr - 1] = comp;

			dev_dbg(dev, "Add comp_id: %d at path index %d\n",

				comp->id, mtk_crtc->ddp_comp_nr - 1);

			break;

		}

	}

}



int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

			     struct mtk_plane_state *state)

{
@@ -685,6 +724,8 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, 
		return;

	}



	mtk_drm_crtc_update_output(crtc, state);



	ret = mtk_crtc_ddp_hw_init(mtk_crtc);

	if (ret) {

		pm_runtime_put(comp->dev);
@@ -884,7 +925,8 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) 


int mtk_drm_crtc_create(struct drm_device *drm_dev,

			const unsigned int *path, unsigned int path_len,

			int priv_data_index)

			int priv_data_index, const struct mtk_drm_route *conn_routes,

			unsigned int num_conn_routes)

{

	struct mtk_drm_private *priv = drm_dev->dev_private;

	struct device *dev = drm_dev->dev;
@@ -935,7 +977,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 


	mtk_crtc->mmsys_dev = priv->mmsys_dev;

	mtk_crtc->ddp_comp_nr = path_len;

	mtk_crtc->ddp_comp = devm_kmalloc_array(dev, mtk_crtc->ddp_comp_nr,

	mtk_crtc->ddp_comp = devm_kmalloc_array(dev,

						mtk_crtc->ddp_comp_nr + (conn_routes ? 1 : 0),

						sizeof(*mtk_crtc->ddp_comp),

						GFP_KERNEL);

	if (!mtk_crtc->ddp_comp)
@@ -1038,5 +1081,30 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
		init_waitqueue_head(&mtk_crtc->cb_blocking_queue);

	}

#endif



	if (conn_routes) {

		for (i = 0; i < num_conn_routes; i++) {

			unsigned int comp_id = conn_routes[i].route_ddp;

			struct device_node *node = priv->comp_node[comp_id];

			struct mtk_ddp_comp *comp = &priv->ddp_comp[comp_id];



			if (!comp->dev) {

				dev_dbg(dev, "comp_id:%d, Component %pOF not initialized\n",

					comp_id, node);

				/* mark encoder_index to -1, if route comp device is not enabled */

				comp->encoder_index = -1;

				continue;

			}



			mtk_ddp_comp_encoder_index_set(&priv->ddp_comp[comp_id]);

		}



		mtk_crtc->num_conn_routes = num_conn_routes;

		mtk_crtc->conn_routes = conn_routes;



		/* increase ddp_comp_nr at the end of mtk_drm_crtc_create */

		mtk_crtc->ddp_comp_nr++;

	}



	return 0;

}

drivers/gpu/drm/mediatek/mtk_drm_crtc.h

+4 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <drm/drm_crtc.h>

#include "mtk_drm_ddp_comp.h"

#include "mtk_drm_drv.h"

#include "mtk_drm_plane.h"



#define MTK_LUT_SIZE	512
@@ -18,7 +19,9 @@ void mtk_drm_crtc_commit(struct drm_crtc *crtc); 
int mtk_drm_crtc_create(struct drm_device *drm_dev,

			const unsigned int *path,

			unsigned int path_len,

			int priv_data_index);

			int priv_data_index,

			const struct mtk_drm_route *conn_routes,

			unsigned int num_conn_routes);

int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

			     struct mtk_plane_state *state);

void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+29 −1
Original line number Diff line number Diff line
@@ -507,6 +507,31 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev, 
	return false;

}



static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,

						       const struct mtk_drm_route *routes,

						       unsigned int num_routes,

						       struct mtk_ddp_comp *ddp_comp)

{

	int ret;

	unsigned int i;



	if (!routes) {

		ret = -EINVAL;

		goto err;

	}



	for (i = 0; i < num_routes; i++)

		if (dev == ddp_comp[routes[i].route_ddp].dev)

			return BIT(routes[i].crtc_id);



	ret = -ENODEV;

err:



	DRM_INFO("Failed to find comp in ddp table, ret = %d\n", ret);



	return 0;

}



int mtk_ddp_comp_get_id(struct device_node *node,

			enum mtk_ddp_comp_type comp_type)

{
@@ -538,7 +563,10 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm, 
					  private->data->third_len, private->ddp_comp))

		ret = BIT(2);

	else

		DRM_INFO("Failed to find comp in ddp table\n");

		ret = mtk_drm_find_comp_in_ddp_conn_path(dev,

							 private->data->conn_routes,

							 private->data->num_conn_routes,

							 private->ddp_comp);



	return ret;

}

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+10 −3
Original line number Diff line number Diff line
@@ -424,6 +424,11 @@ static bool mtk_drm_find_mmsys_comp(struct mtk_drm_private *private, int comp_id 
			if (drv_data->third_path[i] == comp_id)

				return true;



	if (drv_data->num_conn_routes)

		for (i = 0; i < drv_data->num_conn_routes; i++)

			if (drv_data->conn_routes[i].route_ddp == comp_id)

				return true;



	return false;

}
@@ -482,21 +487,23 @@ static int mtk_drm_kms_init(struct drm_device *drm) 


			if (i == CRTC_MAIN && priv_n->data->main_len) {

				ret = mtk_drm_crtc_create(drm, priv_n->data->main_path,

							  priv_n->data->main_len, j);

							  priv_n->data->main_len, j,

							  priv_n->data->conn_routes,

							  priv_n->data->num_conn_routes);

				if (ret)

					goto err_component_unbind;



				continue;

			} else if (i == CRTC_EXT && priv_n->data->ext_len) {

				ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,

							  priv_n->data->ext_len, j);

							  priv_n->data->ext_len, j, NULL, 0);

				if (ret)

					goto err_component_unbind;



				continue;

			} else if (i == CRTC_THIRD && priv_n->data->third_len) {

				ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,

							  priv_n->data->third_len, j);

							  priv_n->data->third_len, j, NULL, 0);

				if (ret)

					goto err_component_unbind;

drivers/gpu/drm/mediatek/mtk_drm_drv.h

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ struct drm_fb_helper; 
struct drm_property;

struct regmap;



struct mtk_drm_route {

	const unsigned int crtc_id;

	const unsigned int route_ddp;

};



struct mtk_mmsys_driver_data {

	const unsigned int *main_path;

	unsigned int main_len;
@@ -35,6 +40,8 @@ struct mtk_mmsys_driver_data { 
	unsigned int ext_len;

	const unsigned int *third_path;

	unsigned int third_len;

	const struct mtk_drm_route *conn_routes;

	unsigned int num_conn_routes;



	bool shadow_register;

	unsigned int mmsys_id;