Commit 0f40ba48 authored by Vinod Koul's avatar Vinod Koul Committed by Dmitry Baryshkov
Browse files

drm/msm/dsi: Pass DSC params to drm_panel 



When DSC is enabled, we need to get the DSC parameters from the panel
driver, so add a dsc parameter in panel to fetch and pass DSC
configuration for DSI panels to DPU encoder, which will enable and
then configure DSC hardware blocks accordingly.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/480910/
Link: https://lore.kernel.org/r/20220406094031.1027376-3-vkoul@kernel.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent b9080324

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 *                      based on num_of_h_tiles

 * @is_te_using_watchdog_timer:  Boolean to indicate watchdog TE is

 *				 used instead of panel TE in cmd mode panels

 * @dsc:		DSC configuration data for DSC-enabled displays

 */

struct msm_display_info {

	int intf_type;
@@ -34,6 +35,7 @@ struct msm_display_info { 
	uint32_t num_of_h_tiles;

	uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY];

	bool is_te_using_watchdog_timer;

	struct msm_display_dsc_config *dsc;

};



/**

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -584,6 +584,8 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, 
			MSM_DISPLAY_CAP_CMD_MODE :

			MSM_DISPLAY_CAP_VID_MODE;



		info.dsc = msm_dsi_get_dsc_config(priv->dsi[i]);



		if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && priv->dsi[other]) {

			rc = msm_dsi_modeset_init(priv->dsi[other], dev, encoder);

			if (rc) {

drivers/gpu/drm/msm/dsi/dsi.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) 
	return !(host_flags & MIPI_DSI_MODE_VIDEO);

}



struct msm_display_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi)

{

	return msm_dsi_host_get_dsc_config(msm_dsi->host);

}



static int dsi_get_phy(struct msm_dsi *msm_dsi)

{

	struct platform_device *pdev = msm_dsi->pdev;

drivers/gpu/drm/msm/dsi/dsi.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ int dsi_calc_clk_rate_v2(struct msm_dsi_host *msm_host, bool is_bonded_dsi); 
int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host, bool is_bonded_dsi);

void msm_dsi_host_snapshot(struct msm_disp_state *disp_state, struct mipi_dsi_host *host);

void msm_dsi_host_test_pattern_en(struct mipi_dsi_host *host);

struct msm_display_dsc_config *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host);



/* dsi phy */

struct msm_dsi_phy;

drivers/gpu/drm/msm/dsi/dsi_host.c

+22 −0
Original line number Diff line number Diff line
@@ -2061,9 +2061,24 @@ int msm_dsi_host_modeset_init(struct mipi_dsi_host *host, 
{

	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);

	const struct msm_dsi_cfg_handler *cfg_hnd = msm_host->cfg_hnd;

	struct drm_panel *panel;

	int ret;



	msm_host->dev = dev;

	panel = msm_dsi_host_get_panel(&msm_host->base);



	if (!IS_ERR(panel) && panel->dsc) {

		struct msm_display_dsc_config *dsc = msm_host->dsc;



		if (!dsc) {

			dsc = devm_kzalloc(&msm_host->pdev->dev, sizeof(*dsc), GFP_KERNEL);

			if (!dsc)

				return -ENOMEM;

			dsc->drm = panel->dsc;

			msm_host->dsc = dsc;

		}

	}



	ret = cfg_hnd->ops->tx_buf_alloc(msm_host, SZ_4K);

	if (ret) {

		pr_err("%s: alloc tx gem obj failed, %d\n", __func__, ret);
@@ -2628,3 +2643,10 @@ void msm_dsi_host_test_pattern_en(struct mipi_dsi_host *host) 
		dsi_write(msm_host, REG_DSI_TEST_PATTERN_GEN_CMD_STREAM0_TRIGGER,

				DSI_TEST_PATTERN_GEN_CMD_STREAM0_TRIGGER_SW_TRIGGER);

}



struct msm_display_dsc_config *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host)

{

	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);



	return msm_host->dsc;

}