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

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

Merge "msm: kgsl: Enable GMU BW scaling and update CP ROQ size"

parents c23063ec 52d1e761

drivers/gpu/msm/adreno_a6xx.c

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

/*

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

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/clk/qcom.h>
@@ -576,7 +576,7 @@ void a6xx_start(struct adreno_device *adreno_dev) 
	kgsl_regwrite(device, A6XX_UCHE_CACHE_WAYS, 0x4);



	/* ROQ sizes are twice as big on a640/a680 than on a630 */

	if (ADRENO_GPUREV(adreno_dev) >= ADRENO_REV_A640) {

	if (ADRENO_GPUREV(adreno_dev) >= ADRENO_REV_A635) {

		kgsl_regwrite(device, A6XX_CP_ROQ_THRESHOLDS_2, 0x02000140);

		kgsl_regwrite(device, A6XX_CP_ROQ_THRESHOLDS_1, 0x8040362C);

	} else if (adreno_is_a612(adreno_dev) || adreno_is_a610(adreno_dev)) {

drivers/gpu/msm/adreno_a6xx_gmu.c

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

/*

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

 * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/clk.h>
@@ -1978,7 +1978,7 @@ static bool a6xx_gmu_scales_bandwidth(struct kgsl_device *device) 
{

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);



	return (ADRENO_GPUREV(adreno_dev) >= ADRENO_REV_A640);

	return (ADRENO_GPUREV(adreno_dev) >= ADRENO_REV_A635);

}



static irqreturn_t a6xx_gmu_irq_handler(int irq, void *data)