Commit 89f1bfc4 authored by Vinod Koul's avatar Vinod Koul Committed by Dmitry Baryshkov
Browse files

drm/msm/dsi: add mode valid callback for dsi_mgr 



Add a mode valid callback for dsi_mgr for checking mode being valid in
case of DSC. For DSC the height and width needs to be multiple of slice,
so we check that here

Reviewed-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/480930/
Link: https://lore.kernel.org/r/20220406094031.1027376-13-vkoul@kernel.org


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

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

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ int msm_dsi_host_power_on(struct mipi_dsi_host *host, 
int msm_dsi_host_power_off(struct mipi_dsi_host *host);

int msm_dsi_host_set_display_mode(struct mipi_dsi_host *host,

				  const struct drm_display_mode *mode);

enum drm_mode_status msm_dsi_host_check_dsc(struct mipi_dsi_host *host,

					    const struct drm_display_mode *mode);

struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host);

unsigned long msm_dsi_host_get_mode_flags(struct mipi_dsi_host *host);

struct drm_bridge *msm_dsi_host_get_bridge(struct mipi_dsi_host *host);

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

+26 −0
Original line number Diff line number Diff line
@@ -2554,6 +2554,32 @@ int msm_dsi_host_set_display_mode(struct mipi_dsi_host *host, 
	return 0;

}



enum drm_mode_status msm_dsi_host_check_dsc(struct mipi_dsi_host *host,

					    const struct drm_display_mode *mode)

{

	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);

	struct msm_display_dsc_config *dsc = msm_host->dsc;

	int pic_width = mode->hdisplay;

	int pic_height = mode->vdisplay;



	if (!msm_host->dsc)

		return MODE_OK;



	if (pic_width % dsc->drm->slice_width) {

		pr_err("DSI: pic_width %d has to be multiple of slice %d\n",

		       pic_width, dsc->drm->slice_width);

		return MODE_H_ILLEGAL;

	}



	if (pic_height % dsc->drm->slice_height) {

		pr_err("DSI: pic_height %d has to be multiple of slice %d\n",

		       pic_height, dsc->drm->slice_height);

		return MODE_V_ILLEGAL;

	}



	return MODE_OK;

}



struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host)

{

	return of_drm_find_panel(to_msm_dsi_host(host)->device_node);

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

+12 −0
Original line number Diff line number Diff line
@@ -573,6 +573,17 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge, 
	dsi_mgr_bridge_power_on(bridge);

}



static enum drm_mode_status dsi_mgr_bridge_mode_valid(struct drm_bridge *bridge,

						      const struct drm_display_info *info,

						      const struct drm_display_mode *mode)

{

	int id = dsi_mgr_bridge_get_id(bridge);

	struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id);

	struct mipi_dsi_host *host = msm_dsi->host;



	return msm_dsi_host_check_dsc(host, mode);

}



static const struct drm_connector_funcs dsi_mgr_connector_funcs = {

	.detect = dsi_mgr_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -593,6 +604,7 @@ static const struct drm_bridge_funcs dsi_mgr_bridge_funcs = { 
	.disable = dsi_mgr_bridge_disable,

	.post_disable = dsi_mgr_bridge_post_disable,

	.mode_set = dsi_mgr_bridge_mode_set,

	.mode_valid = dsi_mgr_bridge_mode_valid,

};



/* initialize connector when we're connected to a drm_panel */