commit 10297895f5cf1271309514ded1b34a2a412c0a92
author Lucille Sylvester <lsylvest@codeaurora.org> Mon Feb 27 13:54:47 2012 -0700
committer Ranjhith Kalisamy <ranjhith@codeaurora.org> Thu Mar 08 12:09:33 2012 +0530
tree 3d8c23195e4821a3aa7845c1ef66ad780b141032
parent b2b85fddd2225d95b7da5daa3d9fad3c2bb01dfb

Revert "msm: kgsl: Remove wakelock and pm_qos requirements"

This reverts commit ef44e7338f1c021909133f481348a641d84652ee.

Conflicts:

	drivers/gpu/msm/kgsl_pwrctrl.c

Change-Id: Ic67995af9e32006ffbe031367df8341f2caedf99
CRs-Fixed: 333977
Signed-off-by: Lucille Sylvester <lsylvest@codeaurora.org>

drivers/gpu/msm/kgsl.c

diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index b7356ac..805e0c1 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -25,7 +25,6 @@
 #include <linux/ashmem.h>
 #include <linux/major.h>
 #include <linux/ion.h>
-#include <mach/socinfo.h>
 
 #include "kgsl.h"
 #include "kgsl_debugfs.h"
@@ -2147,8 +2146,8 @@
 	kgsl_cffdump_close(device->id);
 	kgsl_pwrctrl_uninit_sysfs(device);
 
-	if (cpu_is_msm8x60())
-		wake_lock_destroy(&device->idle_wakelock);
+	wake_lock_destroy(&device->idle_wakelock);
+	pm_qos_remove_request(&device->pm_qos_req_dma);
 
 	idr_destroy(&device->context_idr);
 
@@ -2239,9 +2238,9 @@
 	if (ret != 0)
 		goto err_close_mmu;
 
-	if (cpu_is_msm8x60())
-		wake_lock_init(&device->idle_wakelock,
-					   WAKE_LOCK_IDLE, device->name);
+	wake_lock_init(&device->idle_wakelock, WAKE_LOCK_IDLE, device->name);
+	pm_qos_add_request(&device->pm_qos_req_dma, PM_QOS_CPU_DMA_LATENCY,
+				PM_QOS_DEFAULT_VALUE);
 
 	idr_init(&device->context_idr);