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

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

Merge "mdss: mdp: extract if mdp has ubwc from hw rev"

parents 7c61d649 2634552c

drivers/video/msm/mdss/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ struct mdss_data_type { 
	bool has_pingpong_split;

	bool has_pixel_ram;

	bool needs_hist_vote;

	bool has_ubwc;



	u32 default_ot_rd_limit;

	u32 default_ot_wr_limit;

drivers/video/msm/mdss/mdss_mdp.c

+3 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		mdata->apply_post_scale_bytes = false;

		mdata->hflip_buffer_reused = false;

		mdata->min_prefill_lines = 21;

		mdata->has_ubwc = true;

		set_bit(MDSS_QOS_PER_PIPE_IB, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_OVERHEAD_FACTOR, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map);
@@ -1562,6 +1563,8 @@ static ssize_t mdss_mdp_show_capabilities(struct device *dev, 
	SPRINT("features=");

	if (mdata->has_bwc)

		SPRINT(" bwc");

	if (mdata->has_ubwc)

		SPRINT(" ubwc");

	if (mdata->has_decimation)

		SPRINT(" decimation");

	if (mdata->highest_bank_bit && !mdss_mdp_is_ubwc_supported(mdata))

drivers/video/msm/mdss/mdss_mdp.h

+2 −2
Original line number Diff line number Diff line
@@ -938,9 +938,9 @@ static inline bool mdss_mdp_is_nv12_format(struct mdss_mdp_format_params *fmt) 
		(fmt->fetch_planes == MDSS_MDP_PLANE_PSEUDO_PLANAR);

}



static inline int mdss_mdp_is_ubwc_supported(struct mdss_data_type *mdata)

static inline bool mdss_mdp_is_ubwc_supported(struct mdss_data_type *mdata)

{

	return IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_107);

	return mdata->has_ubwc;

}



static inline int mdss_mdp_is_cdm_supported(struct mdss_data_type *mdata,