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

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

Merge "drm/msm/sde: enable few secure-ui related feature flags for sm8150... 

Merge "drm/msm/sde: enable few secure-ui related feature flags for sm8150 target" into dev/msm-4.14-display
parents ab0d769a 93a9dcc3

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

+6 −0
Original line number Diff line number Diff line
@@ -3548,6 +3548,8 @@ static int _sde_hardware_pre_caps(struct sde_mdss_cfg *sde_cfg, uint32_t hw_rev) 
		sde_cfg->ctl_rev = SDE_CTL_CFG_VERSION_1_0_0;

		sde_cfg->delay_prg_fetch_start = true;

		sde_cfg->sui_ns_allowed = true;

		sde_cfg->sui_misr_supported = true;

		sde_cfg->sui_block_xin_mask = 0x3F71;

	} else if (IS_SDMSHRIKE_TARGET(hw_rev)) {

		sde_cfg->has_wb_ubwc = true;

		sde_cfg->perf.min_prefill_lines = 24;
@@ -3573,6 +3575,10 @@ static int _sde_hardware_post_caps(struct sde_mdss_cfg *sde_cfg, 
	if (!sde_cfg)

		return -EINVAL;



	if (IS_SM8150_TARGET(hw_rev))

		sde_cfg->sui_supported_blendstage =

			sde_cfg->max_mixer_blendstages - SDE_STAGE_0;



	for (i = 0; i < sde_cfg->sspp_count; i++) {

		if (sde_cfg->sspp[i].sblk) {

			max_horz_deci = max(max_horz_deci,