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

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

Merge "rot: enable const color for sde rotator ubwc 3.0" into dev/msm-4.14-display

parents 68d429ce 1215b115

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

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum sde_rot_type { 
 * @SDE_CAPS_UBWC_2: universal bandwidth compression version 2

 * @SDE_CAPS_PARTIALWR: partial write override

 * @SDE_CAPS_HW_TIMESTAMP: rotator has hw timestamp support

 * @SDE_CAPS_UBWC_3: universal bandwidth compression version 3

 */

enum sde_caps_settings {

	SDE_CAPS_R1_WB,
@@ -138,6 +139,7 @@ enum sde_caps_settings { 
	SDE_CAPS_UBWC_2,

	SDE_CAPS_PARTIALWR,

	SDE_CAPS_HW_TIMESTAMP,

	SDE_CAPS_UBWC_3,

	SDE_CAPS_MAX,

};

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

+3 −1
Original line number Diff line number Diff line
@@ -1492,6 +1492,8 @@ static void sde_hw_rotator_setup_fetchengine(struct sde_hw_rotator_context *ctx, 
				((ctx->rot->ubwc_malsize & 0x3) << 8) |

				((ctx->rot->highest_bank & 0x3) << 4) |

				((ctx->rot->ubwc_swizzle & 0x1) << 0));

	else if (test_bit(SDE_CAPS_UBWC_3, mdata->sde_caps_map))

		SDE_REGDMA_WRITE(wrptr, ROT_SSPP_UBWC_STATIC_CTRL, BIT(30));



	/* setup source buffer plane security status */

	if (flags & (SDE_ROT_FLAG_SECURE_OVERLAY_SESSION |
@@ -3078,7 +3080,7 @@ static int sde_rotator_hw_rev_init(struct sde_hw_rotator *rot) 
	if (IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version, SDE_MDP_HW_REV_500)) {

		SDEROT_DBG("Supporting sys cache inline rotation\n");

		set_bit(SDE_CAPS_SBUF_1,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_UBWC_2,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_UBWC_3,  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] =