leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/etnaviv: fold various clock enable/disable functions into top ones

Browse Source 
The driver doesn't ever enable individual clocks alone, so there
is no need to scatter the clock enable/disable sequences through
multiple functions. Fold them into the top one.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
This commit is contained in:
Lucas Stach 2016-08-22 15:26:19 +02:00
parent dc227890d2
commit 9c7310c05d
1 changed files with 30 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
View File

@ -867,63 +867,6 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m)
} }
#endif #endif
/*
* Power Management:
*/
static int enable_clk(struct etnaviv_gpu *gpu)
{
int ret;
if (gpu->clk_core) {
ret = clk_prepare_enable(gpu->clk_core);
if (ret)
return ret;
}
if (gpu->clk_shader) {
ret = clk_prepare_enable(gpu->clk_shader);
if (ret)
goto disable_clk_core;
}
return 0;
disable_clk_core:
clk_disable_unprepare(gpu->clk_core);
return ret;
}
static int disable_clk(struct etnaviv_gpu *gpu)
{
if (gpu->clk_core)
clk_disable_unprepare(gpu->clk_core);
if (gpu->clk_shader)
clk_disable_unprepare(gpu->clk_shader);
return 0;
}
static int enable_axi(struct etnaviv_gpu *gpu)
{
int ret;
if (gpu->clk_bus) {
ret = clk_prepare_enable(gpu->clk_bus);
if (ret)
return ret;
}
return 0;
}
static int disable_axi(struct etnaviv_gpu *gpu)
{
if (gpu->clk_bus)
clk_disable_unprepare(gpu->clk_bus);
return 0;
}
/* /*
* Hangcheck detection for locked gpu: * Hangcheck detection for locked gpu:
*/ */
@ -1484,30 +1427,44 @@ static int etnaviv_gpu_clk_enable(struct etnaviv_gpu *gpu)
{ {
int ret; int ret;
ret = enable_clk(gpu); if (gpu->clk_bus) {
ret = clk_prepare_enable(gpu->clk_bus);
if (ret) if (ret)
return ret; return ret;
}
ret = enable_axi(gpu);
if (ret) { if (gpu->clk_core) {
disable_clk(gpu); ret = clk_prepare_enable(gpu->clk_core);
return ret; if (ret)
goto disable_clk_bus;
}
if (gpu->clk_shader) {
ret = clk_prepare_enable(gpu->clk_shader);
if (ret)
goto disable_clk_core;
} }
return 0; return 0;
disable_clk_core:
if (gpu->clk_core)
clk_disable_unprepare(gpu->clk_core);
disable_clk_bus:
if (gpu->clk_bus)
clk_disable_unprepare(gpu->clk_bus);
return ret;
} }
static int etnaviv_gpu_clk_disable(struct etnaviv_gpu *gpu) static int etnaviv_gpu_clk_disable(struct etnaviv_gpu *gpu)
{ {
int ret; if (gpu->clk_shader)
clk_disable_unprepare(gpu->clk_shader);
ret = disable_axi(gpu); if (gpu->clk_core)
if (ret) clk_disable_unprepare(gpu->clk_core);
return ret; if (gpu->clk_bus)
clk_disable_unprepare(gpu->clk_bus);
ret = disable_clk(gpu);
if (ret)
return ret;
return 0; return 0;
} }