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

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

Merge "msm: kgsl: Do not enable adreno core feature by default"

parents 89583eb1 49c98250

drivers/gpu/msm/adreno.c

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ static struct adreno_device device_3d0 = { 
	.long_ib_detect = 1,

	.input_work = __WORK_INITIALIZER(device_3d0.input_work,

		adreno_input_work),

	.pwrctrl_flag = BIT(ADRENO_SPTP_PC_CTRL) |

		BIT(ADRENO_THROTTLING_CTRL) | BIT(ADRENO_HWCG_CTRL),

	.pwrctrl_flag = BIT(ADRENO_THROTTLING_CTRL) | BIT(ADRENO_HWCG_CTRL),

	.profile.enabled = false,

	.active_list = LIST_HEAD_INIT(device_3d0.active_list),

	.active_list_lock = __SPIN_LOCK_UNLOCKED(device_3d0.active_list_lock),

drivers/gpu/msm/adreno_a5xx.c

+4 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/clk/qcom.h>
@@ -149,6 +149,9 @@ static void a5xx_platform_setup(struct adreno_device *adreno_dev) 
	/* Set the GPU busy counter to use for frequency scaling */

	adreno_dev->perfctr_pwr_lo = A5XX_RBBM_PERFCTR_RBBM_0_LO;



	if (ADRENO_FEATURE(adreno_dev, ADRENO_SPTP_PC))

		set_bit(ADRENO_SPTP_PC_CTRL, &adreno_dev->pwrctrl_flag);



	/* Check efuse bits for various capabilties */

	a5xx_check_features(adreno_dev);

}

drivers/gpu/msm/adreno_a6xx.c

+3 −0
Original line number Diff line number Diff line
@@ -2324,6 +2324,9 @@ static void a6xx_platform_setup(struct adreno_device *adreno_dev) 
		adreno_dev->perfctr_ifpc_lo =

			A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4_L;



	if (ADRENO_FEATURE(adreno_dev, ADRENO_SPTP_PC))

		set_bit(ADRENO_SPTP_PC_CTRL, &adreno_dev->pwrctrl_flag);



	/* Check efuse bits for various capabilties */

	a6xx_check_features(adreno_dev);

}