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

Commit 6a725740 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 atoll target" into dev/msm-4.14-display

parents b52601a7 cd7f417d

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#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_HW_REV_620	SDE_MDP_REV(6, 2, 0)	/* atoll */



#define SDE_MDP_VBIF_4_LEVEL_REMAPPER	4

#define SDE_MDP_VBIF_8_LEVEL_REMAPPER	8

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

+11 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3132,7 +3132,9 @@ int sde_rotator_core_init(struct sde_rot_mgr **pmgr, 
		IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_410) ||

		IS_SDE_MAJOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_500)) {

			SDE_MDP_HW_REV_500) ||

		IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_620)) {

		mgr->ops_hw_init = sde_rotator_r3_init;

		mgr->min_rot_clk = ROT_MIN_ROT_CLK;
@@ -3142,11 +3144,15 @@ int sde_rotator_core_init(struct sde_rot_mgr **pmgr, 
		 * ensure we do not cross the max allowed clock for rotator

		 */

		if (IS_SDE_MAJOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_500))

			SDE_MDP_HW_REV_500) ||

			IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_620))

			mgr->max_rot_clk = ROT_R3_MAX_ROT_CLK;



		if (!IS_SDE_MAJOR_SAME(mdata->mdss_version,

					SDE_MDP_HW_REV_500) &&

		if (!(IS_SDE_MAJOR_SAME(mdata->mdss_version,

					SDE_MDP_HW_REV_500) ||

			IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

			SDE_MDP_HW_REV_620)) &&

				!sde_rotator_get_clk(mgr,

					SDE_ROTATOR_CLK_MDSS_AXI)) {

			SDEROT_ERR("unable to get mdss_axi_clk\n");

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

+3 −1
Original line number Diff line number Diff line
@@ -3414,7 +3414,9 @@ static int sde_rotator_hw_rev_init(struct sde_hw_rotator *rot) 
		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)) {

				SDE_MDP_HW_REV_540) ||

				IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version,

				SDE_MDP_HW_REV_620)) {

		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);