shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Mali: utgard: actually use rk_context::is_powered

Browse Source 
Fix the following warning reported
in https://redmine.rock-chips.com/issues/230655 :

[   76.900395] ------------[ cut here ]------------
[   76.900404] aclk_gpu already disabled
[   76.900503] WARNING: CPU: 3 PID: 1674 at drivers/clk/clk.c:829 clk_core_disable+0x250/0x268
...

Change-Id: Iaf26ce07574b9909188cde99142a13e98a9a93de
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
This commit is contained in:
Zhen Chen
2020-11-09 22:51:25 +08:00
committed by Tao Huang
parent 480eb468dc
commit 15a5ee10cc
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/arm/mali400/mali/platform/rk/rk.c
View File

@@ -416,18 +416,23 @@ static void rk_platform_disable_gpu_regulator(struct device *dev)
static int rk_platform_power_on_gpu(struct device *dev)
{
struct rk_context *platform = s_rk_context;
int ret = 0;
ret = rk_platform_enable_clk_gpu(dev);
if (ret) {
E("fail to enable clk_gpu, ret : %d.", ret);
goto fail_to_enable_clk;
}
if (!(platform->is_powered)) {
ret = rk_platform_enable_clk_gpu(dev);
if (ret) {
E("fail to enable clk_gpu, ret : %d.", ret);
goto fail_to_enable_clk;
}
ret = rk_platform_enable_gpu_regulator(dev);
if (ret) {
E("fail to enable vdd_gpu, ret : %d.", ret);
goto fail_to_enable_regulator;
ret = rk_platform_enable_gpu_regulator(dev);
if (ret) {
E("fail to enable vdd_gpu, ret : %d.", ret);
goto fail_to_enable_regulator;
}
platform->is_powered = true;
}
return 0;
@@ -441,8 +446,14 @@ fail_to_enable_clk:
static void rk_platform_power_off_gpu(struct device *dev)
{
rk_platform_disable_clk_gpu(dev);
rk_platform_disable_gpu_regulator(dev);
struct rk_context *platform = s_rk_context;
if (platform->is_powered) {
rk_platform_disable_clk_gpu(dev);
rk_platform_disable_gpu_regulator(dev);
platform->is_powered = false;
}
}
int rk_platform_init_opp_table(struct device *dev)