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

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

Merge "msm/sde/rotator: Add rev checks for trinket target"

parents f9a1245c 9a628edf

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

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define SDE_MDP_HW_REV_500	SDE_MDP_REV(5, 0, 0)	/* sm8150 v1.0 */

#define SDE_MDP_HW_REV_520	SDE_MDP_REV(5, 2, 0)	/* sdmmagpie v1.0 */

#define SDE_MDP_HW_REV_530	SDE_MDP_REV(5, 3, 0)	/* sm6150 v1.0 */

#define SDE_MDP_HW_REV_540	SDE_MDP_REV(5, 4, 0)	/* sdmtrinket v1.0 */



#define SDE_MDP_VBIF_4_LEVEL_REMAPPER	4

#define SDE_MDP_VBIF_8_LEVEL_REMAPPER	8

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+16 −0
Original line number Diff line number Diff line
@@ -3369,6 +3369,22 @@ static int sde_rotator_hw_rev_init(struct sde_hw_rotator *rot) 
				ARRAY_SIZE(sde_hw_rotator_v4_outpixfmts_sbuf);

		rot->downscale_caps =

			"LINEAR/1.5/2/4/8/16/32/64 TILE/1.5/2/4 TP10/1.5/2";

	} else if (IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

				SDE_MDP_HW_REV_540)) {

		SDEROT_DBG("Sys cache inline rotation not supported\n");

		set_bit(SDE_CAPS_UBWC_2,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_PARTIALWR,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_HW_TIMESTAMP, mdata->sde_caps_map);

		rot->inpixfmts[SDE_ROTATOR_MODE_OFFLINE] =

				sde_hw_rotator_v4_inpixfmts;

		rot->num_inpixfmt[SDE_ROTATOR_MODE_OFFLINE] =

				ARRAY_SIZE(sde_hw_rotator_v4_inpixfmts);

		rot->outpixfmts[SDE_ROTATOR_MODE_OFFLINE] =

				sde_hw_rotator_v4_outpixfmts;

		rot->num_outpixfmt[SDE_ROTATOR_MODE_OFFLINE] =

				ARRAY_SIZE(sde_hw_rotator_v4_outpixfmts);

		rot->downscale_caps =

			"LINEAR/1.5/2/4/8/16/32/64 TILE/1.5/2/4 TP10/1.5/2";

	} else if (IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

				SDE_MDP_HW_REV_400) ||

			IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,