summaryrefslogtreecommitdiff
path: root/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
diff options
context:
space:
mode:
authorLoren HUANG <b02279@freescale.com>2013-01-29 16:12:29 +0800
committerLoren HUANG <b02279@freescale.com>2013-01-29 20:46:11 +0800
commit698d46e6a807a93eabf18bf79efd92a78cb1a106 (patch)
tree397064d298e6e0ec3e00a8b978cc62d3e9243ea7 /drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
parenta1f6f4ee9de45b4407a4781342ec475f23d52684 (diff)
ENGR00242201-3 gpu: Makeup GPU driver for kernel 3.5.7
Signed-off-by: Loren HUANG <b02279@freescale.com> Acked-by: Lily Zhang
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c')
-rw-r--r--drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
index 792dd96aac1c..af20f0baed1e 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -6801,12 +6801,11 @@ gckOS_SetGPUPower(
case gcvCORE_MAJOR:
clk_prepare(clk_3dcore);
clk_enable(clk_3dcore);
- /*if (cpu_is_mx6q())*/
- clk_prepare(clk_3dshader);
- clk_enable(clk_3dshader);
- clk_prepare(clk_3d_axi);
- clk_enable(clk_3d_axi);
- break;
+ clk_prepare(clk_3dshader);
+ clk_enable(clk_3dshader);
+ clk_prepare(clk_3d_axi);
+ clk_enable(clk_3d_axi);
+ break;
case gcvCORE_2D:
clk_prepare(clk_2dcore);
clk_enable(clk_2dcore);
@@ -6827,9 +6826,8 @@ gckOS_SetGPUPower(
if (oldClockState == gcvTRUE) {
switch (Core) {
case gcvCORE_MAJOR:
- /*if (cpu_is_mx6q())*/
- clk_disable(clk_3dshader);
- clk_unprepare(clk_3dshader);
+ clk_disable(clk_3dshader);
+ clk_unprepare(clk_3dshader);
clk_disable(clk_3dcore);
clk_unprepare(clk_3dcore);
clk_disable(clk_3d_axi);