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

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

Merge "msm: mdss: Add mdss capabilities for qcs405"

parents dfeeaa94 4c451172

drivers/video/fbdev/msm/mdss_mdp.c

+4 −0
Original line number Diff line number Diff line
@@ -2013,6 +2013,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		mdss_set_quirk(mdata, MDSS_QUIRK_NEED_SECURE_MAP);

		break;

	case MDSS_MDP_HW_REV_115:

	case MDSS_MDP_HW_REV_117:

		mdata->max_target_zorder = 4; /* excluding base layer */

		mdata->max_cursor_size = 128;

		mdata->min_prefill_lines = 14;
@@ -2029,6 +2030,8 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		set_bit(MDSS_CAPS_MIXER_1_FOR_WB, mdata->mdss_caps_map);

		mdss_mdp_init_default_prefill_factors(mdata);

		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		set_bit(MDSS_CAPS_SCM_RESTORE_NOT_REQUIRED,

			mdata->mdss_caps_map);

		mdss_set_quirk(mdata, MDSS_QUIRK_DMA_BI_DIR);

		mdss_set_quirk(mdata, MDSS_QUIRK_NEED_SECURE_MAP);

		break;
@@ -4713,6 +4716,7 @@ static void apply_dynamic_ot_limit(u32 *ot_lim, 
		/* fall-through */

	case MDSS_MDP_HW_REV_115:

	case MDSS_MDP_HW_REV_116:

	case MDSS_MDP_HW_REV_117:

		if ((res <= RES_1080p) && (params->frame_rate <= 30))

			*ot_lim = 2;

		else if (params->is_rot && params->is_yuv)

drivers/video/fbdev/msm/mdss_mdp.h

+3 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,9 @@ static inline int mdss_mdp_panic_signal_support_mode( 
		IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,

				MDSS_MDP_HW_REV_115) ||

		IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,

				MDSS_MDP_HW_REV_116))

				MDSS_MDP_HW_REV_116) ||

		IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,

				MDSS_MDP_HW_REV_117))

		signal_mode = MDSS_MDP_PANIC_PER_PIPE_CFG;



	return signal_mode;

drivers/video/fbdev/msm/mdss_mdp_pp.c

+1 −0
Original line number Diff line number Diff line
@@ -7528,6 +7528,7 @@ static int pp_get_driver_ops(struct mdp_pp_driver_ops *ops) 
	case MDSS_MDP_HW_REV_114:

	case MDSS_MDP_HW_REV_115:

	case MDSS_MDP_HW_REV_116:

	case MDSS_MDP_HW_REV_117:

		pp_cfg = pp_get_driver_ops_v1_7(ops);

		if (IS_ERR_OR_NULL(pp_cfg))

			ret = -EINVAL;

include/uapi/linux/msm_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
#define MDSS_MDP_HW_REV_114	MDSS_MDP_REV(1, 14, 0) /* 8937 v1.0 */

#define MDSS_MDP_HW_REV_115	MDSS_MDP_REV(1, 15, 0) /* msmgold */

#define MDSS_MDP_HW_REV_116	MDSS_MDP_REV(1, 16, 0) /* msmtitanium */

#define MDSS_MDP_HW_REV_117	MDSS_MDP_REV(1, 17, 0) /* qcs405 */

#define MDSS_MDP_HW_REV_300	MDSS_MDP_REV(3, 0, 0)  /* msmcobalt */

#define MDSS_MDP_HW_REV_301	MDSS_MDP_REV(3, 0, 1)  /* msmcobalt v1.0 */