Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5917f56a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: add connector property for frame trigger mode"

parents 5295af95 faa45619

drivers/gpu/drm/msm/msm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ enum msm_mdp_conn_property { 
	CONNECTOR_PROP_LP,

	CONNECTOR_PROP_FB_TRANSLATION_MODE,

	CONNECTOR_PROP_QSYNC_MODE,

	CONNECTOR_PROP_CMD_FRAME_TRIGGER_MODE,



	/* total # of properties */

	CONNECTOR_PROP_COUNT

drivers/gpu/drm/msm/sde/sde_connector.c

+129 −110
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ static const struct drm_prop_enum_list e_qsync_mode[] = { 
	{SDE_RM_QSYNC_DISABLED,	"none"},

	{SDE_RM_QSYNC_CONTINUOUS_MODE,	"continuous"},

};

static const struct drm_prop_enum_list e_frame_trigger_mode[] = {

	{FRAME_DONE_WAIT_DEFAULT, "default"},

	{FRAME_DONE_WAIT_SERIALIZE, "serialize_frame_trigger"},

	{FRAME_DONE_WAIT_POSTED_START, "posted_start"},

};



static int sde_backlight_device_update_status(struct backlight_device *bd)

{
@@ -1153,15 +1158,14 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector, 
		c_conn->bl_scale_ad = val;

		c_conn->bl_scale_dirty = true;

		break;

	default:

		break;

	}



	if (idx == CONNECTOR_PROP_HDR_METADATA) {

	case CONNECTOR_PROP_HDR_METADATA:

		rc = _sde_connector_set_ext_hdr_info(c_conn,

			c_state, (void *)(uintptr_t)val);

		if (rc)

			SDE_ERROR_CONN(c_conn, "cannot set hdr info %d\n", rc);

		break;

	default:

		break;

	}



	/* check for custom property handling */
@@ -2036,6 +2040,122 @@ int sde_connector_set_blob_data(struct drm_connector *conn, 
	return rc;

}



static int _sde_connector_install_properties(struct drm_device *dev,

	struct sde_kms *sde_kms, struct sde_connector *c_conn,

	int connector_type, void *display,

	struct msm_display_info *display_info)

{

	struct dsi_display *dsi_display;

	int rc;



	msm_property_install_blob(&c_conn->property_info, "capabilities",

			DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_SDE_INFO);



	rc = sde_connector_set_blob_data(&c_conn->base,

			NULL, CONNECTOR_PROP_SDE_INFO);

	if (rc) {

		SDE_ERROR_CONN(c_conn,

			"failed to setup connector info, rc = %d\n", rc);

		return rc;

	}



	msm_property_install_blob(&c_conn->property_info, "mode_properties",

			DRM_MODE_PROP_IMMUTABLE, CONNECTOR_PROP_MODE_INFO);



	if (connector_type == DRM_MODE_CONNECTOR_DSI) {

		dsi_display = (struct dsi_display *)(display);

		if (dsi_display && dsi_display->panel &&

			dsi_display->panel->hdr_props.hdr_enabled == true) {

			msm_property_install_blob(&c_conn->property_info,

				"hdr_properties",

				DRM_MODE_PROP_IMMUTABLE,

				CONNECTOR_PROP_HDR_INFO);



			msm_property_set_blob(&c_conn->property_info,

				&c_conn->blob_hdr,

				&dsi_display->panel->hdr_props,

				sizeof(dsi_display->panel->hdr_props),

				CONNECTOR_PROP_HDR_INFO);

		}

	}



	msm_property_install_volatile_range(

			&c_conn->property_info, "sde_drm_roi_v1", 0x0,

			0, ~0, 0, CONNECTOR_PROP_ROI_V1);



	/* install PP_DITHER properties */

	_sde_connector_install_dither_property(dev, sde_kms, c_conn);



	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort) {

		struct drm_msm_ext_hdr_properties hdr = {0};



		msm_property_install_blob(&c_conn->property_info,

				"ext_hdr_properties",

				DRM_MODE_PROP_IMMUTABLE,

				CONNECTOR_PROP_EXT_HDR_INFO);



		/* set default values to avoid reading uninitialized data */

		msm_property_set_blob(&c_conn->property_info,

			      &c_conn->blob_ext_hdr,

			      &hdr,

			      sizeof(hdr),

			      CONNECTOR_PROP_EXT_HDR_INFO);

	}



	msm_property_install_volatile_range(&c_conn->property_info,

		"hdr_metadata", 0x0, 0, ~0, 0, CONNECTOR_PROP_HDR_METADATA);



	msm_property_install_volatile_range(&c_conn->property_info,

		"RETIRE_FENCE", 0x0, 0, ~0, 0, CONNECTOR_PROP_RETIRE_FENCE);



	msm_property_install_range(&c_conn->property_info, "autorefresh",

			0x0, 0, AUTOREFRESH_MAX_FRAME_CNT, 0,

			CONNECTOR_PROP_AUTOREFRESH);



	if (connector_type == DRM_MODE_CONNECTOR_DSI) {

		if (sde_kms->catalog->has_qsync && display_info->qsync_min_fps)

			msm_property_install_enum(&c_conn->property_info,

					"qsync_mode", 0, 0, e_qsync_mode,

					ARRAY_SIZE(e_qsync_mode),

					CONNECTOR_PROP_QSYNC_MODE);



		if (display_info->capabilities & MSM_DISPLAY_CAP_CMD_MODE)

			msm_property_install_enum(&c_conn->property_info,

				"frame_trigger_mode", 0, 0,

				e_frame_trigger_mode,

				ARRAY_SIZE(e_frame_trigger_mode),

				CONNECTOR_PROP_CMD_FRAME_TRIGGER_MODE);

	}



	msm_property_install_range(&c_conn->property_info, "bl_scale",

		0x0, 0, MAX_BL_SCALE_LEVEL, MAX_BL_SCALE_LEVEL,

		CONNECTOR_PROP_BL_SCALE);



	msm_property_install_range(&c_conn->property_info, "ad_bl_scale",

		0x0, 0, MAX_AD_BL_SCALE_LEVEL, MAX_AD_BL_SCALE_LEVEL,

		CONNECTOR_PROP_AD_BL_SCALE);



	c_conn->bl_scale_dirty = false;

	c_conn->bl_scale = MAX_BL_SCALE_LEVEL;

	c_conn->bl_scale_ad = MAX_AD_BL_SCALE_LEVEL;



	/* enum/bitmask properties */

	msm_property_install_enum(&c_conn->property_info, "topology_name",

			DRM_MODE_PROP_IMMUTABLE, 0, e_topology_name,

			ARRAY_SIZE(e_topology_name),

			CONNECTOR_PROP_TOPOLOGY_NAME);

	msm_property_install_enum(&c_conn->property_info, "topology_control",

			0, 1, e_topology_control,

			ARRAY_SIZE(e_topology_control),

			CONNECTOR_PROP_TOPOLOGY_CONTROL);

	msm_property_install_enum(&c_conn->property_info, "LP",

			0, 0, e_power_mode,

			ARRAY_SIZE(e_power_mode),

			CONNECTOR_PROP_LP);



	return 0;

}



struct drm_connector *sde_connector_init(struct drm_device *dev,

		struct drm_encoder *encoder,

		struct drm_panel *panel,
@@ -2047,7 +2167,6 @@ struct drm_connector *sde_connector_init(struct drm_device *dev, 
	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	struct sde_connector *c_conn = NULL;

	struct dsi_display *dsi_display;

	struct msm_display_info display_info;

	int rc;
@@ -2155,42 +2274,6 @@ struct drm_connector *sde_connector_init(struct drm_device *dev, 
		}

	}



	msm_property_install_blob(&c_conn->property_info,

			"capabilities",

			DRM_MODE_PROP_IMMUTABLE,

			CONNECTOR_PROP_SDE_INFO);



	rc = sde_connector_set_blob_data(&c_conn->base,

			NULL,

			CONNECTOR_PROP_SDE_INFO);

	if (rc) {

		SDE_ERROR_CONN(c_conn,

			"failed to setup connector info, rc = %d\n", rc);

		goto error_cleanup_fence;

	}



	msm_property_install_blob(&c_conn->property_info,

			"mode_properties",

			DRM_MODE_PROP_IMMUTABLE,

			CONNECTOR_PROP_MODE_INFO);



	if (connector_type == DRM_MODE_CONNECTOR_DSI) {

		dsi_display = (struct dsi_display *)(display);

		if (dsi_display && dsi_display->panel &&

			dsi_display->panel->hdr_props.hdr_enabled == true) {

			msm_property_install_blob(&c_conn->property_info,

				"hdr_properties",

				DRM_MODE_PROP_IMMUTABLE,

				CONNECTOR_PROP_HDR_INFO);



			msm_property_set_blob(&c_conn->property_info,

				&c_conn->blob_hdr,

				&dsi_display->panel->hdr_props,

				sizeof(dsi_display->panel->hdr_props),

				CONNECTOR_PROP_HDR_INFO);

		}

	}



	rc = sde_connector_get_info(&c_conn->base, &display_info);

	if (!rc && (connector_type == DRM_MODE_CONNECTOR_DSI) &&

			(display_info.capabilities & MSM_DISPLAY_CAP_VID_MODE))
@@ -2199,74 +2282,10 @@ struct drm_connector *sde_connector_init(struct drm_device *dev, 
			sde_connector_handle_disp_recovery,

			c_conn);



	msm_property_install_volatile_range(

			&c_conn->property_info, "sde_drm_roi_v1", 0x0,

			0, ~0, 0, CONNECTOR_PROP_ROI_V1);



	/* install PP_DITHER properties */

	_sde_connector_install_dither_property(dev, sde_kms, c_conn);



	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort) {

		struct drm_msm_ext_hdr_properties hdr = {0};



		msm_property_install_blob(&c_conn->property_info,

				"ext_hdr_properties",

				DRM_MODE_PROP_IMMUTABLE,

				CONNECTOR_PROP_EXT_HDR_INFO);



		/* set default values to avoid reading uninitialized data */

		msm_property_set_blob(&c_conn->property_info,

			      &c_conn->blob_ext_hdr,

			      &hdr,

			      sizeof(hdr),

			      CONNECTOR_PROP_EXT_HDR_INFO);

	}



	msm_property_install_volatile_range(&c_conn->property_info,

		"hdr_metadata", 0x0, 0, ~0, 0, CONNECTOR_PROP_HDR_METADATA);



	msm_property_install_volatile_range(&c_conn->property_info,

		"RETIRE_FENCE", 0x0, 0, ~0, 0, CONNECTOR_PROP_RETIRE_FENCE);



	msm_property_install_range(&c_conn->property_info, "autorefresh",

			0x0, 0, AUTOREFRESH_MAX_FRAME_CNT, 0,

			CONNECTOR_PROP_AUTOREFRESH);



	if (connector_type == DRM_MODE_CONNECTOR_DSI) {

		if (sde_kms->catalog->has_qsync && display_info.qsync_min_fps) {



			msm_property_install_enum(&c_conn->property_info,

					"qsync_mode", 0, 0, e_qsync_mode,

					ARRAY_SIZE(e_qsync_mode),

					CONNECTOR_PROP_QSYNC_MODE);

		}

	}



	msm_property_install_range(&c_conn->property_info, "bl_scale",

		0x0, 0, MAX_BL_SCALE_LEVEL, MAX_BL_SCALE_LEVEL,

		CONNECTOR_PROP_BL_SCALE);



	msm_property_install_range(&c_conn->property_info, "ad_bl_scale",

		0x0, 0, MAX_AD_BL_SCALE_LEVEL, MAX_AD_BL_SCALE_LEVEL,

		CONNECTOR_PROP_AD_BL_SCALE);



	c_conn->bl_scale_dirty = false;

	c_conn->bl_scale = MAX_BL_SCALE_LEVEL;

	c_conn->bl_scale_ad = MAX_AD_BL_SCALE_LEVEL;



	/* enum/bitmask properties */

	msm_property_install_enum(&c_conn->property_info, "topology_name",

			DRM_MODE_PROP_IMMUTABLE, 0, e_topology_name,

			ARRAY_SIZE(e_topology_name),

			CONNECTOR_PROP_TOPOLOGY_NAME);

	msm_property_install_enum(&c_conn->property_info, "topology_control",

			0, 1, e_topology_control,

			ARRAY_SIZE(e_topology_control),

			CONNECTOR_PROP_TOPOLOGY_CONTROL);

	msm_property_install_enum(&c_conn->property_info, "LP",

			0, 0, e_power_mode,

			ARRAY_SIZE(e_power_mode),

			CONNECTOR_PROP_LP);

	rc = _sde_connector_install_properties(dev, sde_kms, c_conn,

		connector_type, display, &display_info);

	if (rc)

		goto error_cleanup_fence;



	rc = msm_property_install_get_status(&c_conn->property_info);

	if (rc) {

drivers/gpu/drm/msm/sde/sde_encoder.c

+32 −22
Original line number Diff line number Diff line
@@ -4378,6 +4378,29 @@ static int _helper_flush_qsync(struct sde_encoder_phys *phys_enc) 
	return 0;

}



static void _sde_encoder_needs_hw_reset(struct drm_encoder *drm_enc,

	int ln_cnt1)

{

	struct sde_encoder_virt *sde_enc = to_sde_encoder_virt(drm_enc);

	struct sde_encoder_phys *phys;

	int ln_cnt2, i;



	/* query line count before cur_master is updated */

	if (sde_enc->cur_master && sde_enc->cur_master->ops.get_wr_line_count)

		ln_cnt2 = sde_enc->cur_master->ops.get_wr_line_count(

			sde_enc->cur_master);

	else

		ln_cnt2 = -EINVAL;



	SDE_EVT32(DRMID(drm_enc), ln_cnt1, ln_cnt2);



	for (i = 0; i < sde_enc->num_phys_encs; i++) {

		phys = sde_enc->phys_encs[i];

		if (phys && phys->ops.hw_reset)

			phys->ops.hw_reset(phys);

	}

}



int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc,

		struct sde_encoder_kickoff_params *params)

{
@@ -4386,9 +4409,7 @@ int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, 
	struct sde_kms *sde_kms = NULL;

	struct msm_drm_private *priv = NULL;

	bool needs_hw_reset = false;

	uint32_t ln_cnt1, ln_cnt2;

	unsigned int i;

	int rc, ret = 0;

	int ln_cnt1 = -EINVAL, i, rc, ret = 0;

	struct msm_display_info *disp_info;



	if (!drm_enc || !params || !drm_enc->dev ||
@@ -4408,8 +4429,12 @@ int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, 
	if (sde_enc->cur_master && sde_enc->cur_master->ops.get_wr_line_count)

		ln_cnt1 = sde_enc->cur_master->ops.get_wr_line_count(

				sde_enc->cur_master);

	else

		ln_cnt1 = -EINVAL;



	if (sde_enc->cur_master && sde_enc->cur_master->connector &&

	    disp_info->capabilities & MSM_DISPLAY_CAP_CMD_MODE)

		sde_enc->frame_trigger_mode = sde_connector_get_property(

			sde_enc->cur_master->connector->state,

			CONNECTOR_PROP_CMD_FRAME_TRIGGER_MODE);



	/* prepare for next kickoff, may include waiting on previous kickoff */

	SDE_ATRACE_BEGIN("sde_encoder_prepare_for_kickoff");
@@ -4446,23 +4471,8 @@ int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, 
	}



	/* if any phys needs reset, reset all phys, in-order */

	if (needs_hw_reset) {

		/* query line count before cur_master is updated */

		if (sde_enc->cur_master &&

				sde_enc->cur_master->ops.get_wr_line_count)

			ln_cnt2 = sde_enc->cur_master->ops.get_wr_line_count(

					sde_enc->cur_master);

		else

			ln_cnt2 = -EINVAL;



		SDE_EVT32(DRMID(drm_enc), ln_cnt1, ln_cnt2,

				SDE_EVTLOG_FUNC_CASE1);

		for (i = 0; i < sde_enc->num_phys_encs; i++) {

			phys = sde_enc->phys_encs[i];

			if (phys && phys->ops.hw_reset)

				phys->ops.hw_reset(phys);

		}

	}

	if (needs_hw_reset)

		_sde_encoder_needs_hw_reset(drm_enc, ln_cnt1);



	_sde_encoder_update_master(drm_enc, params);