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

Commit 4ac0b886 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: add encoder helper to get kms"

parents 29425291 b96cd591

msm/sde/sde_encoder.c

+45 −56
Original line number Diff line number Diff line
@@ -863,7 +863,6 @@ static int sde_encoder_virt_atomic_check( 
	struct drm_connector_state *conn_state)

{

	struct sde_encoder_virt *sde_enc;

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	const struct drm_display_mode *mode;

	struct drm_display_mode *adj_mode;
@@ -882,8 +881,10 @@ static int sde_encoder_virt_atomic_check( 
	sde_enc = to_sde_encoder_virt(drm_enc);

	SDE_DEBUG_ENC(sde_enc, "\n");



	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms)

		return -EINVAL;



	mode = &crtc_state->mode;

	adj_mode = &crtc_state->adjusted_mode;

	sde_conn = to_sde_connector(conn_state->connector);
@@ -993,10 +994,8 @@ void sde_encoder_helper_vsync_config(struct sde_encoder_phys *phys_enc, 
			u32 vsync_source, bool is_dummy)

{

	struct sde_vsync_source_cfg vsync_cfg = { 0 };

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	struct sde_hw_mdp *hw_mdptop;

	struct drm_encoder *drm_enc;

	struct sde_encoder_virt *sde_enc;

	int i;
@@ -1012,11 +1011,7 @@ void sde_encoder_helper_vsync_config(struct sde_encoder_phys *phys_enc, 
		return;

	}



	drm_enc = &sde_enc->base;

	/* this pointers are checked in virt_enable_helper */

	priv = drm_enc->dev->dev_private;



	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);

	if (!sde_kms) {

		SDE_ERROR("invalid sde_kms\n");

		return;
@@ -1384,15 +1379,15 @@ struct sde_rsc_client *sde_encoder_get_rsc_client(struct drm_encoder *drm_enc) 
static int _sde_encoder_resource_control_helper(struct drm_encoder *drm_enc,

		bool enable)

{

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	struct sde_encoder_virt *sde_enc;

	int rc;

	bool is_cmd_mode = false;



	sde_enc = to_sde_encoder_virt(drm_enc);

	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms)

		return -EINVAL;



	if (sde_encoder_check_curr_mode(drm_enc, MSM_DISPLAY_CMD_MODE))

		is_cmd_mode = true;
@@ -2043,7 +2038,6 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc, 
				      struct drm_display_mode *adj_mode)

{

	struct sde_encoder_virt *sde_enc;

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	struct drm_connector_list_iter conn_iter;

	struct drm_connector *conn = NULL, *conn_search;
@@ -2070,8 +2064,9 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc, 
	if (sde_encoder_check_curr_mode(drm_enc, MSM_DISPLAY_CMD_MODE))

		is_cmd_mode = true;



	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms)

		return;



	SDE_EVT32(DRMID(drm_enc));
@@ -2380,7 +2375,6 @@ static int _sde_encoder_input_handler( 
static void _sde_encoder_virt_enable_helper(struct drm_encoder *drm_enc)

{

	struct sde_encoder_virt *sde_enc = NULL;

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;



	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
@@ -2388,12 +2382,9 @@ static void _sde_encoder_virt_enable_helper(struct drm_encoder *drm_enc) 
		return;

	}



	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	if (!sde_kms) {

		SDE_ERROR("invalid sde_kms\n");

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms)

		return;

	}



	sde_enc = to_sde_encoder_virt(drm_enc);

	if (!sde_enc || !sde_enc->cur_master) {
@@ -2654,7 +2645,6 @@ static void sde_encoder_virt_enable(struct drm_encoder *drm_enc) 
static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)

{

	struct sde_encoder_virt *sde_enc = NULL;

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	enum sde_intf_mode intf_mode;

	int i = 0;
@@ -2678,8 +2668,10 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc) 
	sde_enc = to_sde_encoder_virt(drm_enc);

	SDE_DEBUG_ENC(sde_enc, "\n");



	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);

	if (!sde_kms)

		return;



	intf_mode = sde_encoder_get_intf_mode(drm_enc);



	SDE_EVT32(DRMID(drm_enc));
@@ -3398,15 +3390,13 @@ static void _sde_encoder_kickoff_phys(struct sde_encoder_virt *sde_enc) 
	_sde_encoder_trigger_start(sde_enc->cur_master);



	if (sde_enc->elevated_ahb_vote) {

		sde_kms = sde_encoder_get_kms(&sde_enc->base);

		priv = sde_enc->base.dev->dev_private;

		if (priv != NULL) {

			sde_kms = to_sde_kms(priv->kms);

		if (sde_kms != NULL) {

			sde_power_scale_reg_bus(&priv->phandle,

					VOTE_INDEX_LOW,

					false);

		}

		}

		sde_enc->elevated_ahb_vote = false;

	}
@@ -3941,7 +3931,6 @@ int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, 
	struct sde_encoder_phys *phys;

	struct sde_kms *sde_kms = NULL;

	struct sde_crtc *sde_crtc;

	struct msm_drm_private *priv = NULL;

	bool needs_hw_reset = false, is_cmd_mode;

	int i, rc, ret = 0;

	struct msm_display_info *disp_info;
@@ -3952,8 +3941,10 @@ int sde_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, 
		return -EINVAL;

	}

	sde_enc = to_sde_encoder_virt(drm_enc);

	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms)

		return -EINVAL;



	disp_info = &sde_enc->disp_info;

	sde_crtc = to_sde_crtc(sde_enc->crtc);
@@ -4341,7 +4332,6 @@ static ssize_t _sde_encoder_misr_setup(struct file *file, 
	char buf[MISR_BUFF_SIZE + 1];

	size_t buff_copy;

	u32 frame_count, enable;

	struct msm_drm_private *priv = NULL;

	struct sde_kms *sde_kms = NULL;

	struct drm_encoder *drm_enc;
@@ -4349,11 +4339,13 @@ static ssize_t _sde_encoder_misr_setup(struct file *file, 
		return -EINVAL;



	sde_enc = file->private_data;

	priv = sde_enc->base.dev->dev_private;

	if (!sde_enc || !priv || !priv->kms)

	if (!sde_enc)

		return -EINVAL;



	sde_kms = sde_encoder_get_kms(&sde_enc->base);

	if (!sde_kms)

		return -EINVAL;



	sde_kms = to_sde_kms(priv->kms);

	drm_enc = &sde_enc->base;



	if (sde_kms_is_secure_session_inprogress(sde_kms)) {
@@ -4385,7 +4377,6 @@ static ssize_t _sde_encoder_misr_read(struct file *file, 
		char __user *user_buff, size_t count, loff_t *ppos)

{

	struct sde_encoder_virt *sde_enc;

	struct msm_drm_private *priv = NULL;

	struct sde_kms *sde_kms = NULL;

	struct drm_encoder *drm_enc;

	int i = 0, len = 0;
@@ -4399,9 +4390,9 @@ static ssize_t _sde_encoder_misr_read(struct file *file, 
		return -EINVAL;



	sde_enc = file->private_data;

	priv = sde_enc->base.dev->dev_private;

	if (priv != NULL)

		sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);

	if (!sde_kms)

		return -EINVAL;



	if (sde_kms_is_secure_session_inprogress(sde_kms)) {

		SDE_DEBUG_ENC(sde_enc, "misr read not allowed\n");
@@ -4467,7 +4458,6 @@ static ssize_t _sde_encoder_misr_read(struct file *file, 
static int _sde_encoder_init_debugfs(struct drm_encoder *drm_enc)

{

	struct sde_encoder_virt *sde_enc;

	struct msm_drm_private *priv;

	struct sde_kms *sde_kms;

	int i;
@@ -4486,14 +4476,17 @@ static int _sde_encoder_init_debugfs(struct drm_encoder *drm_enc) 


	char name[SDE_NAME_SIZE];



	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {

		SDE_ERROR("invalid encoder or kms\n");

	if (!drm_enc) {

		SDE_ERROR("invalid encoder\n");

		return -EINVAL;

	}



	sde_enc = to_sde_encoder_virt(drm_enc);

	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(drm_enc);

	if (!sde_kms) {

		SDE_ERROR("invalid sde_kms\n");

		return -EINVAL;

	}



	snprintf(name, SDE_NAME_SIZE, "encoder%u", drm_enc->base.id);
@@ -5116,19 +5109,15 @@ int sde_encoder_update_caps_for_cont_splash(struct drm_encoder *encoder, 
		return -EINVAL;

	}



	if (!encoder->dev || !encoder->dev->dev_private) {

		SDE_ERROR("drm device invalid\n");

	sde_enc = to_sde_encoder_virt(encoder);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);

	if (!sde_kms) {

		SDE_ERROR("invalid sde_kms\n");

		return -EINVAL;

	}



	priv = encoder->dev->dev_private;

	if (!priv->kms) {

		SDE_ERROR("invalid kms\n");

		return -EINVAL;

	}



	sde_kms = to_sde_kms(priv->kms);

	sde_enc = to_sde_encoder_virt(encoder);

	if (!priv->num_connectors) {

		SDE_ERROR_ENC(sde_enc, "No connectors registered\n");

		return -EINVAL;

msm/sde/sde_encoder.h

+20 −0
Original line number Diff line number Diff line
@@ -528,4 +528,24 @@ void sde_encoder_needs_hw_reset(struct drm_encoder *enc); 
 */

void sde_encoder_uidle_enable(struct drm_encoder *drm_enc, bool enable);



/**

 * sde_encoder_get_kms - retrieve the kms from encoder

 * @drm_enc:    Pointer to drm encoder structure

 */

static inline struct sde_kms *sde_encoder_get_kms(struct drm_encoder *drm_enc)

{

	struct msm_drm_private *priv;



	if (!drm_enc || !drm_enc->dev) {

		SDE_ERROR("invalid encoder\n");

		return NULL;

	}

	priv = drm_enc->dev->dev_private;

	if (!priv || !priv->kms) {

		SDE_ERROR("invalid kms\n");

		return NULL;

	}



	return to_sde_kms(priv->kms);

}

#endif /* __SDE_ENCODER_H__ */

msm/sde/sde_encoder_dce.c

+68 −70
Original line number Diff line number Diff line
@@ -301,19 +301,16 @@ static inline bool _dce_check_half_panel_update(int num_lm, 
	return (hweight_long(affected_displays) != num_lm);

}



static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc,

		struct sde_encoder_kickoff_params *params)

static int _dce_dsc_setup_helper(struct sde_encoder_virt *sde_enc,

		unsigned long affected_displays,

		enum sde_rm_topology_name topology)

{

	struct sde_kms *sde_kms;

	struct msm_drm_private *priv;

	struct drm_encoder *drm_enc;

	struct drm_connector *drm_conn;

	struct sde_encoder_phys *enc_master;

	struct sde_hw_dsc *hw_dsc[MAX_CHANNELS_PER_ENC];

	struct sde_hw_pingpong *hw_pp[MAX_CHANNELS_PER_ENC];

	struct sde_hw_pingpong *hw_dsc_pp[MAX_CHANNELS_PER_ENC];

	struct msm_display_dsc_info *dsc = NULL;

	enum sde_rm_topology_name topology;

	const struct sde_rm_topology_def *def;

	const struct sde_rect *roi;

	struct sde_hw_ctl *hw_ctl;
@@ -328,91 +325,59 @@ static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc, 
	int dsc_common_mode = 0;

	int i;



	if (!sde_enc || !params || !sde_enc->phys_encs[0] ||

			!sde_enc->phys_encs[0]->connector)

		return -EINVAL;



	drm_conn = sde_enc->phys_encs[0]->connector;

	drm_enc = &sde_enc->base;

	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);



	topology = sde_connector_get_topology_name(drm_conn);

	if (topology == SDE_RM_TOPOLOGY_NONE) {

		SDE_ERROR_DCE(sde_enc, "topology not set yet\n");

	def = sde_rm_topology_get_topology_def(&sde_kms->rm, topology);

	if (IS_ERR_OR_NULL(def))

		return -EINVAL;

	}



	SDE_DEBUG_DCE(sde_enc, "topology:%d\n", topology);



	if (sde_kms_rect_is_equal(&sde_enc->cur_conn_roi,

			&sde_enc->prv_conn_roi))

		return 0;



	SDE_EVT32(DRMID(&sde_enc->base), topology,

			sde_enc->cur_conn_roi.x,

			sde_enc->cur_conn_roi.y,

			sde_enc->cur_conn_roi.w,

			sde_enc->cur_conn_roi.h,

			sde_enc->prv_conn_roi.x,

			sde_enc->prv_conn_roi.y,

			sde_enc->prv_conn_roi.w,

			sde_enc->prv_conn_roi.h,

			sde_enc->cur_master->cached_mode.hdisplay,

			sde_enc->cur_master->cached_mode.vdisplay);



	enc_master = sde_enc->cur_master;

	roi = &sde_enc->cur_conn_roi;

	hw_ctl = enc_master->hw_ctl;

	dsc = &sde_enc->mode_info.comp_info.dsc_info;



	def = sde_rm_topology_get_topology_def(&sde_kms->rm, topology);

	if (IS_ERR_OR_NULL(def))

		return -EINVAL;



	num_dsc = def->num_comp_enc;

	num_intf = def->num_intf;

	mode_3d = (topology == SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_DSC) ?

		BLEND_3D_H_ROW_INT : BLEND_3D_NONE;

	num_lm = def->num_lm;



	half_panel_partial_update = _dce_check_half_panel_update(num_lm,

		affected_displays);

	merge_3d = (mode_3d != BLEND_3D_NONE) ? true : false;

	dsc_merge = ((num_dsc > num_intf) && !half_panel_partial_update) ?

		true : false;

	disable_merge_3d = (merge_3d && half_panel_partial_update) ?

		false : true;



	/*

	 * If this encoder is driving more than one DSC encoder, they

	 * operate in tandem, same pic dimension needs to be used by

	 * each of them.(pp-split is assumed to be not supported)

	 */

	_dce_dsc_update_pic_dim(dsc, roi->w, roi->h);

	merge_3d = (mode_3d != BLEND_3D_NONE) ? true: false;

	dsc_merge = (num_dsc > num_intf) ? true : false;

	half_panel_partial_update = _dce_check_half_panel_update(num_lm,

		params->affected_displays);



	if (half_panel_partial_update && merge_3d)

		disable_merge_3d = true;

	this_frame_slices = roi->w / dsc->config.slice_width;

	intf_ip_w = this_frame_slices * dsc->config.slice_width;

	enc_ip_w = intf_ip_w;



	if (!half_panel_partial_update && !merge_3d)

	if (!half_panel_partial_update)

		intf_ip_w /= def->num_intf;

	if (!half_panel_partial_update && (num_dsc > 1))

		dsc_common_mode |= DSC_MODE_SPLIT_PANEL;

	if (dsc_merge)

	if (dsc_merge) {

		dsc_common_mode |= DSC_MODE_MULTIPLEX;

		/*

		 * in dsc merge case: when using 2 encoders for the same

		 * stream, no. of slices need to be same on both the

		 * encoders.

		 */

		enc_ip_w = intf_ip_w / 2;

	}

	if (enc_master->intf_mode == INTF_MODE_VIDEO)

		dsc_common_mode |= DSC_MODE_VIDEO;



	this_frame_slices = roi->w / dsc->config.slice_width;

	intf_ip_w = this_frame_slices * dsc->config.slice_width;



	if ((!half_panel_partial_update) && (num_intf > 1))

		intf_ip_w /= 2;



	sde_dsc_populate_dsc_private_params(dsc, intf_ip_w);



	/*

	 * in dsc merge case: when using 2 encoders for the same stream,

	 * no. of slices need to be same on both the encoders.

	 */

	enc_ip_w = intf_ip_w;

	if (dsc_merge)

		enc_ip_w = intf_ip_w / 2;



	_dce_dsc_initial_line_calc(dsc, enc_ip_w, dsc_common_mode);



	/*
@@ -426,7 +391,7 @@ static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc, 
				roi->w, roi->h, dsc_common_mode);



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

		bool active = !!((1 << i) & params->affected_displays);

		bool active = !!((1 << i) & affected_displays);



		/*

		 * in 3d_merge and half_panel partial update dsc should be
@@ -443,7 +408,8 @@ static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc, 
		hw_dsc_pp[i] = sde_enc->hw_dsc_pp[i];



		if (!hw_pp[i] || !hw_dsc[i]) {

			SDE_ERROR_DCE(sde_enc, "invalid params for DSC\n");

			SDE_ERROR_DCE(sde_enc, "DSC: invalid params %d %d\n",

					!!hw_pp[i], !!hw_dsc[i]);

			SDE_EVT32(DRMID(&sde_enc->base), !hw_pp[i], !hw_dsc[i],

					SDE_EVTLOG_ERROR);

			return -EINVAL;
@@ -506,13 +472,47 @@ static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc, 
	return 0;

}



static int _dce_dsc_setup(struct sde_encoder_virt *sde_enc,

		struct sde_encoder_kickoff_params *params)

{

	struct drm_connector *drm_conn;

	enum sde_rm_topology_name topology;



	if (!sde_enc || !params || !sde_enc->phys_encs[0] ||

			!sde_enc->phys_encs[0]->connector)

		return -EINVAL;



	drm_conn = sde_enc->phys_encs[0]->connector;



	topology = sde_connector_get_topology_name(drm_conn);

	if (topology == SDE_RM_TOPOLOGY_NONE) {

		SDE_ERROR_DCE(sde_enc, "topology not set yet\n");

		return -EINVAL;

	}



	SDE_DEBUG_DCE(sde_enc, "topology:%d\n", topology);



	if (sde_kms_rect_is_equal(&sde_enc->cur_conn_roi,

			&sde_enc->prv_conn_roi))

		return 0;



	SDE_EVT32(DRMID(&sde_enc->base), topology,

			sde_enc->cur_conn_roi.x, sde_enc->cur_conn_roi.y,

			sde_enc->cur_conn_roi.w, sde_enc->cur_conn_roi.h,

			sde_enc->prv_conn_roi.x, sde_enc->prv_conn_roi.y,

			sde_enc->prv_conn_roi.w, sde_enc->prv_conn_roi.h,

			sde_enc->cur_master->cached_mode.hdisplay,

			sde_enc->cur_master->cached_mode.vdisplay);



	return _dce_dsc_setup_helper(sde_enc, params->affected_displays,

			topology);

}



static int _dce_vdc_setup(struct sde_encoder_virt *sde_enc,

		struct sde_encoder_kickoff_params *params)

{

	struct drm_connector *drm_conn;

	struct sde_kms *sde_kms;

	struct msm_drm_private *priv;

	struct drm_encoder *drm_enc;

	struct sde_encoder_phys *enc_master;

	struct sde_hw_vdc *hw_vdc[MAX_CHANNELS_PER_ENC];

	struct sde_hw_pingpong *hw_pp[MAX_CHANNELS_PER_ENC];
@@ -565,9 +565,7 @@ static int _dce_vdc_setup(struct sde_encoder_virt *sde_enc, 
	hw_ctl = enc_master->hw_ctl;

	vdc = &sde_enc->mode_info.comp_info.vdc_info;



	drm_enc = &sde_enc->base;

	priv = drm_enc->dev->dev_private;

	sde_kms = to_sde_kms(priv->kms);

	sde_kms = sde_encoder_get_kms(&sde_enc->base);



	def = sde_rm_topology_get_topology_def(&sde_kms->rm, topology);

	if (IS_ERR_OR_NULL(def))