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

Commit 88166ee4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents dcf33a84 a7eeb757

drivers/video/msm/mdss/mdss_mdp.c

+8 −2
Original line number Diff line number Diff line
@@ -1279,12 +1279,17 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		break;

	case MDSS_MDP_HW_REV_114:

	case MDSS_MDP_HW_REV_115:

	case MDSS_MDP_HW_REV_116:

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

		mdata->max_cursor_size = 128;

		mdata->min_prefill_lines = 14;

		mdata->has_ubwc = true;

		mdata->pixel_ram_size = 40 * 1024;

		mdata->has_ubwc =

			(mdata->mdp_rev == MDSS_MDP_HW_REV_115) ?

			false : true;

		mdata->pixel_ram_size =

			(mdata->mdp_rev == MDSS_MDP_HW_REV_115) ?

			(16 * 1024) : (40 * 1024);

		mdata->apply_post_scale_bytes = false;

		mdata->hflip_buffer_reused = false;

		set_bit(MDSS_QOS_OVERHEAD_FACTOR, mdata->mdss_qos_map);
@@ -3779,6 +3784,7 @@ static void apply_dynamic_ot_limit(u32 *ot_lim, 


	switch (mdata->mdp_rev) {

	case MDSS_MDP_HW_REV_114:

	case MDSS_MDP_HW_REV_115:

	case MDSS_MDP_HW_REV_116:

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

			*ot_lim = 2;

drivers/video/msm/mdss/mdss_mdp.h

+4 −0
Original line number Diff line number Diff line
@@ -947,6 +947,8 @@ static inline bool mdss_mdp_req_init_restore_cfg(struct mdss_data_type *mdata) 
				MDSS_MDP_HW_REV_112) ||

	    IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,

				MDSS_MDP_HW_REV_114) ||

	    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))

		return true;
@@ -972,6 +974,8 @@ static inline int mdss_mdp_panic_signal_support_mode( 
				MDSS_MDP_HW_REV_107) ||

		IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev,

				MDSS_MDP_HW_REV_114) ||

		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))

		signal_mode = MDSS_MDP_PANIC_PER_PIPE_CFG;

include/uapi/linux/msm_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#define MDSS_MDP_HW_REV_200	MDSS_MDP_REV(2, 0, 0) /* 8092 v1.0 */

#define MDSS_MDP_HW_REV_112	MDSS_MDP_REV(1, 12, 0) /* 8952 v1.0 */

#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 */



enum {