Commit e10e1a40 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm: move KMS driver data to msm_kms 



Data for HDMI, DSI and DP blocks only makes sense for the KMS parts of
the driver. Move corresponding data pointers from struct msm_drm_private
to struct msm_kms.

Suggested-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/662580/


Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
parent 0bb2335f

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

+6 −5
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ bool dpu_encoder_needs_periph_flush(struct dpu_encoder_phys *phys_enc) 
	mode = &phys_enc->cached_mode;



	return phys_enc->hw_intf->cap->type == INTF_DP &&

	       msm_dp_needs_periph_flush(priv->dp[disp_info->h_tile_instance[0]], mode);

	       msm_dp_needs_periph_flush(priv->kms->dp[disp_info->h_tile_instance[0]], mode);

}



/**
@@ -283,9 +283,9 @@ bool dpu_encoder_is_widebus_enabled(const struct drm_encoder *drm_enc) 
	index = disp_info->h_tile_instance[0];



	if (disp_info->intf_type == INTF_DP)

		return msm_dp_wide_bus_available(priv->dp[index]);

		return msm_dp_wide_bus_available(priv->kms->dp[index]);

	else if (disp_info->intf_type == INTF_DSI)

		return msm_dsi_wide_bus_enabled(priv->dsi[index]);

		return msm_dsi_wide_bus_enabled(priv->kms->dsi[index]);



	return false;

}
@@ -647,7 +647,7 @@ struct drm_dsc_config *dpu_encoder_get_dsc_config(struct drm_encoder *drm_enc) 
	int index = dpu_enc->disp_info.h_tile_instance[0];



	if (dpu_enc->disp_info.intf_type == INTF_DSI)

		return msm_dsi_get_dsc_config(priv->dsi[index]);

		return msm_dsi_get_dsc_config(priv->kms->dsi[index]);



	return NULL;

}
@@ -709,7 +709,8 @@ void dpu_encoder_update_topology(struct drm_encoder *drm_enc, 
		if (fb && MSM_FORMAT_IS_YUV(msm_framebuffer_format(fb)))

			topology->num_cdm++;

	} else if (disp_info->intf_type == INTF_DP) {

		if (msm_dp_is_yuv_420_enabled(priv->dp[disp_info->h_tile_instance[0]], adj_mode))

		if (msm_dp_is_yuv_420_enabled(priv->kms->dp[disp_info->h_tile_instance[0]],

					      adj_mode))

			topology->num_cdm++;

	}

}

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

+16 −16
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, 
	struct msm_display_info info;

	int i, rc = 0;



	if (!(priv->dsi[0] || priv->dsi[1]))

	if (!(priv->kms->dsi[0] || priv->kms->dsi[1]))

		return rc;



	/*
@@ -594,26 +594,26 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, 
	 *

	 * TODO: Support swapping DSI0 and DSI1 in the bonded setup.

	 */

	for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) {

	for (i = 0; i < ARRAY_SIZE(priv->kms->dsi); i++) {

		int other = (i + 1) % 2;



		if (!priv->dsi[i])

		if (!priv->kms->dsi[i])

			continue;



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

		    !msm_dsi_is_master_dsi(priv->dsi[i]))

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

		    !msm_dsi_is_master_dsi(priv->kms->dsi[i]))

			continue;



		memset(&info, 0, sizeof(info));

		info.intf_type = INTF_DSI;



		info.h_tile_instance[info.num_of_h_tiles++] = i;

		if (msm_dsi_is_bonded_dsi(priv->dsi[i]))

		if (msm_dsi_is_bonded_dsi(priv->kms->dsi[i]))

			info.h_tile_instance[info.num_of_h_tiles++] = other;



		info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->dsi[i]);

		info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->kms->dsi[i]);



		rc = dpu_kms_dsi_set_te_source(&info, priv->dsi[i]);

		rc = dpu_kms_dsi_set_te_source(&info, priv->kms->dsi[i]);

		if (rc) {

			DPU_ERROR("failed to identify TE source for dsi display\n");

			return rc;
@@ -625,15 +625,15 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, 
			return PTR_ERR(encoder);

		}



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

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

		if (rc) {

			DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n",

				i, rc);

			break;

		}



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

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

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

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

			if (rc) {

				DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n",

					other, rc);
@@ -655,8 +655,8 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, 
	int rc;

	int i;



	for (i = 0; i < ARRAY_SIZE(priv->dp); i++) {

		if (!priv->dp[i])

	for (i = 0; i < ARRAY_SIZE(priv->kms->dp); i++) {

		if (!priv->kms->dp[i])

			continue;



		memset(&info, 0, sizeof(info));
@@ -671,7 +671,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, 
		}



		yuv_supported = !!dpu_kms->catalog->cdm;

		rc = msm_dp_modeset_init(priv->dp[i], dev, encoder, yuv_supported);

		rc = msm_dp_modeset_init(priv->kms->dp[i], dev, encoder, yuv_supported);

		if (rc) {

			DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc);

			return rc;
@@ -689,7 +689,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *dev, 
	struct msm_display_info info;

	int rc;



	if (!priv->hdmi)

	if (!priv->kms->hdmi)

		return 0;



	memset(&info, 0, sizeof(info));
@@ -703,7 +703,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *dev, 
		return PTR_ERR(encoder);

	}



	rc = msm_hdmi_modeset_init(priv->hdmi, dev, encoder);

	rc = msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder);

	if (rc) {

		DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc);

		return rc;

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+4 −4
Original line number Diff line number Diff line
@@ -250,9 +250,9 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, 
		/* DTV can be hooked to DMA_E: */

		encoder->possible_crtcs = 1 << 1;



		if (priv->hdmi) {

		if (priv->kms->hdmi) {

			/* Construct bridge/connector for HDMI: */

			ret = msm_hdmi_modeset_init(priv->hdmi, dev, encoder);

			ret = msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder);

			if (ret) {

				DRM_DEV_ERROR(dev->dev, "failed to initialize HDMI: %d\n", ret);

				return ret;
@@ -264,7 +264,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, 
		/* only DSI1 supported for now */

		dsi_id = 0;



		if (!priv->dsi[dsi_id])

		if (!priv->kms->dsi[dsi_id])

			break;



		encoder = mdp4_dsi_encoder_init(dev);
@@ -278,7 +278,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, 
		/* TODO: Add DMA_S later? */

		encoder->possible_crtcs = 1 << DMA_P;



		ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder);

		ret = msm_dsi_modeset_init(priv->kms->dsi[dsi_id], dev, encoder);

		if (ret) {

			DRM_DEV_ERROR(dev->dev, "failed to initialize DSI: %d\n",

				ret);

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+7 −6
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, 
		DRM_DEV_INFO(dev->dev, "Skipping eDP interface %d\n", intf->num);

		break;

	case INTF_HDMI:

		if (!priv->hdmi)

		if (!priv->kms->hdmi)

			break;



		ctl = mdp5_ctlm_request(ctlm, intf->num);
@@ -327,7 +327,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, 
			break;

		}



		ret = msm_hdmi_modeset_init(priv->hdmi, dev, encoder);

		ret = msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder);

		break;

	case INTF_DSI:

	{
@@ -335,14 +335,14 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, 
					mdp5_cfg_get_hw_config(mdp5_kms->cfg);

		int dsi_id = get_dsi_id_from_intf(hw_cfg, intf->num);



		if ((dsi_id >= ARRAY_SIZE(priv->dsi)) || (dsi_id < 0)) {

		if ((dsi_id >= ARRAY_SIZE(priv->kms->dsi)) || (dsi_id < 0)) {

			DRM_DEV_ERROR(dev->dev, "failed to find dsi from intf %d\n",

				intf->num);

			ret = -EINVAL;

			break;

		}



		if (!priv->dsi[dsi_id])

		if (!priv->kms->dsi[dsi_id])

			break;



		ctl = mdp5_ctlm_request(ctlm, intf->num);
@@ -357,9 +357,10 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, 
			break;

		}



		ret = msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder);

		ret = msm_dsi_modeset_init(priv->kms->dsi[dsi_id], dev, encoder);

		if (!ret)

			mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_id]));

			mdp5_encoder_set_intf_mode(encoder,

						   msm_dsi_is_cmd_mode(priv->kms->dsi[dsi_id]));



		break;

	}

drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c

+6 −6
Original line number Diff line number Diff line
@@ -127,18 +127,18 @@ void msm_disp_snapshot_capture_state(struct msm_disp_state *disp_state) 
	priv = drm_dev->dev_private;

	kms = priv->kms;



	for (i = 0; i < ARRAY_SIZE(priv->dp); i++) {

		if (!priv->dp[i])

	for (i = 0; i < ARRAY_SIZE(kms->dp); i++) {

		if (!kms->dp[i])

			continue;



		msm_dp_snapshot(disp_state, priv->dp[i]);

		msm_dp_snapshot(disp_state, kms->dp[i]);

	}



	for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) {

		if (!priv->dsi[i])

	for (i = 0; i < ARRAY_SIZE(kms->dsi); i++) {

		if (!kms->dsi[i])

			continue;



		msm_dsi_snapshot(disp_state, priv->dsi[i]);

		msm_dsi_snapshot(disp_state, kms->dsi[i]);

	}



	if (kms->funcs->snapshot)