A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 12:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: kgsl: Check correct register for clamps on a660"

Browse source
This commit is contained in:
qctecmdr 2020-01-10 22:56:18 -08:00 • committed by Gerrit - the friendly Code Review server
commit 68ff2ae5b2
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/msm/a6xx_reg.h
View file

@ -1054,7 +1054,9 @@
/* GPUCC registers */
#define A6XX_GPU_CC_GX_GDSCR 0x24403
#define A6XX_GPU_CC_GX_DOMAIN_MISC 0x24542
#define A6XX_GPU_CC_GX_DOMAIN_MISC 0x24542
#define A6XX_GPU_CC_GX_DOMAIN_MISC3 0x24563
/* GPU RSC sequencer registers */
#define A6XX_GPU_RSCC_RSC_STATUS0_DRV0 0x00004

9
drivers/gpu/msm/adreno_a6xx_gmu.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*/
/* soc/qcom/cmd-db.h needs types.h */
@ -408,7 +408,12 @@ static int a6xx_rpmh_power_on_gpu(struct kgsl_device *device)
if (!test_bit(GMU_RSCC_SLEEP_SEQ_DONE, &device->gmu_core.flags))
return 0;
gmu_core_regread(device, A6XX_GPU_CC_GX_DOMAIN_MISC, &val);
/* A660 has a replacement register */
if (adreno_is_a660(ADRENO_DEVICE(device)))
gmu_core_regread(device, A6XX_GPU_CC_GX_DOMAIN_MISC3, &val);
else
gmu_core_regread(device, A6XX_GPU_CC_GX_DOMAIN_MISC, &val);
if (!(val & 0x1))
dev_err_ratelimited(&gmu->pdev->dev,
"GMEM CLAMP IO not set while GFX rail off\n");