evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: kgsl: Check GPMU presence before accessing power counters"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-30 07:05:31 -08:00 • committed by Gerrit - the friendly Code Review server
commit d9f73b621e
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/msm/adreno_perfcounter.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2002,2007-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2002,2007-2017, 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
@ -638,6 +638,9 @@ static void _perfcounter_enable_vbif_pwr(struct adreno_device *adreno_dev,
static void _power_counter_enable_alwayson(struct adreno_device *adreno_dev,
struct adreno_perfcounters *counters)
{
if (!ADRENO_FEATURE(adreno_dev, ADRENO_GPMU))
return;
kgsl_regwrite(KGSL_DEVICE(adreno_dev),
A5XX_GPMU_ALWAYS_ON_COUNTER_RESET, 1);
counters->groups[KGSL_PERFCOUNTER_GROUP_ALWAYSON_PWR].regs[0].value = 0;
@ -674,6 +677,9 @@ static void _power_counter_enable_default(struct adreno_device *adreno_dev,
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
struct adreno_perfcount_register *reg;
if (!ADRENO_FEATURE(adreno_dev, ADRENO_GPMU))
return;
reg = &counters->groups[group].regs[counter];
kgsl_regwrite(device, reg->select, countable);
kgsl_regwrite(device, A5XX_GPMU_POWER_COUNTER_ENABLE, 1);
@ -927,6 +933,9 @@ static uint64_t _perfcounter_read_pwrcntr(struct adreno_device *adreno_dev,
struct adreno_perfcount_register *reg;
unsigned int lo = 0, hi = 0;
if (!ADRENO_FEATURE(adreno_dev, ADRENO_GPMU))
return 0;
reg = &group->regs[counter];
kgsl_regread(device, reg->offset, &lo);