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

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

Merge "msm/sde/rotator: Add rev checks for sdm670"

parents c606fa93 292e0a2e

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

+5 −3
Original line number Diff line number Diff line
@@ -2891,7 +2891,8 @@ static int sde_hardware_format_caps(struct sde_mdss_cfg *sde_cfg, 
	vig_list_size += ARRAY_SIZE(rgb_10bit_formats)

		+ ARRAY_SIZE(tp10_ubwc_formats)

		+ ARRAY_SIZE(p010_formats);

	if (IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_400))

	if (IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_400) ||

		(IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_410)))

		vig_list_size += ARRAY_SIZE(p010_ubwc_formats);



	wb2_list_size += ARRAY_SIZE(rgb_10bit_formats)
@@ -2932,7 +2933,8 @@ static int sde_hardware_format_caps(struct sde_mdss_cfg *sde_cfg, 
		ARRAY_SIZE(rgb_10bit_formats));

	index += sde_copy_formats(sde_cfg->vig_formats, vig_list_size,

		index, p010_formats, ARRAY_SIZE(p010_formats));

	if (IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_400))

	if (IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_400) ||

		(IS_SDE_MAJOR_MINOR_SAME((hw_rev), SDE_HW_VER_410)))

		index += sde_copy_formats(sde_cfg->vig_formats,

			vig_list_size, index, p010_ubwc_formats,

			ARRAY_SIZE(p010_ubwc_formats));
@@ -2971,7 +2973,7 @@ static int _sde_hardware_caps(struct sde_mdss_cfg *sde_cfg, uint32_t hw_rev) 
		sde_cfg->perf.min_prefill_lines = 25;

		sde_cfg->vbif_qos_nlvl = 4;

		sde_cfg->ts_prefill_rev = 1;

	} else if (IS_SDM845_TARGET(hw_rev)) {

	} else if (IS_SDM845_TARGET(hw_rev) || IS_SDM670_TARGET(hw_rev)) {

		/* update sdm845 target here */

		sde_cfg->has_wb_ubwc = true;

		sde_cfg->perf.min_prefill_lines = 24;

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

+2 −0
Original line number Diff line number Diff line
@@ -46,10 +46,12 @@ 
#define SDE_HW_VER_301	SDE_HW_VER(3, 0, 1) /* 8998 v1.1 */

#define SDE_HW_VER_400	SDE_HW_VER(4, 0, 0) /* sdm845 v1.0 */

#define SDE_HW_VER_401	SDE_HW_VER(4, 0, 1) /* sdm845 v2.0 */

#define SDE_HW_VER_410	SDE_HW_VER(4, 1, 0) /* sdm670 v1.0 */



#define IS_MSM8996_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_170)

#define IS_MSM8998_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_300)

#define IS_SDM845_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)

#define IS_SDM670_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_410)



#define SDE_HW_BLK_NAME_LEN	16

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

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void _setup_mixer_ops(struct sde_mdss_cfg *m, 
		unsigned long features)

{

	ops->setup_mixer_out = sde_hw_lm_setup_out;

	if (IS_SDM845_TARGET(m->hwversion))

	if (IS_SDM845_TARGET(m->hwversion) || IS_SDM670_TARGET(m->hwversion))

		ops->setup_blend_config = sde_hw_lm_setup_blend_config_sdm845;

	else

		ops->setup_blend_config = sde_hw_lm_setup_blend_config;

drivers/gpu/drm/msm/sde_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -3075,7 +3075,7 @@ void sde_dbg_init_dbg_buses(u32 hwversion) 
		dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus_msm8998;

		dbg->dbgbus_vbif_rt.cmn.entries_size =

				ARRAY_SIZE(vbif_dbg_bus_msm8998);

	} else if (IS_SDM845_TARGET(hwversion)) {

	} else if (IS_SDM845_TARGET(hwversion) || IS_SDM670_TARGET(hwversion)) {

		dbg->dbgbus_sde.entries = dbg_bus_sde_sdm845;

		dbg->dbgbus_sde.cmn.entries_size =

				ARRAY_SIZE(dbg_bus_sde_sdm845);

drivers/media/platform/msm/sde/rotator/sde_rotator_base.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define SDE_MDP_HW_REV_300	SDE_MDP_REV(3, 0, 0)	/* 8998 v1.0 */

#define SDE_MDP_HW_REV_301	SDE_MDP_REV(3, 0, 1)	/* 8998 v1.1 */

#define SDE_MDP_HW_REV_400	SDE_MDP_REV(4, 0, 0)	/* sdm845 v1.0 */

#define SDE_MDP_HW_REV_410	SDE_MDP_REV(4, 1, 0)	/* sdm670 v1.0 */



#define SDE_MDP_VBIF_4_LEVEL_REMAPPER	4

#define SDE_MDP_VBIF_8_LEVEL_REMAPPER	8