aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
diff options
context:
space:
mode:
authorMichael Demeter <michael.demeter@intel.com>2010-12-09 10:37:32 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:32 +0000
commit2e270a17e0ecab878ab1c4c93eac5718a106d331 (patch)
tree1ba87325edd2acb6e59a0b21ac542d297c5b9b84 /drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
parent72f2faf642b85eda44a1ac40cccdd370bb987350 (diff)
downloadmrst-s0i3-test-2e270a17e0ecab878ab1c4c93eac5718a106d331.tar.gz
mrst-s0i3-test-2e270a17e0ecab878ab1c4c93eac5718a106d331.tar.xz
mrst-s0i3-test-2e270a17e0ecab878ab1c4c93eac5718a106d331.zip
CE4100 pvr update from IMG moving to version 3082
(merged the header and type fixes so we get a buildable tree both sides) Signed-off-by: Michael Demeter <michael.demeter@intel.com>
Diffstat (limited to 'drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c')
-rwxr-xr-xdrivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c b/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
index 8430e1a09e5..5501ea3104d 100755
--- a/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
+++ b/drivers/staging/ice4100/sgx535/devices/sgx/sgxinit.c
@@ -345,15 +345,24 @@ PVRSRV_ERROR SGXInitialise(PVRSRV_SGXDEV_INFO * psDevInfo)
MAKEUNIQUETAG(psSGXHostCtlMemInfo));
#endif
+#if defined(SGX_FEATURE_MULTI_EVENT_KICK)
+ OSWriteHWReg(psDevInfo->pvRegsBaseKM,
+ SGX_MP_CORE_SELECT(EUR_CR_EVENT_KICK2, 0),
+ EUR_CR_EVENT_KICK2_NOW_MASK);
+#else
*psDevInfo->pui32KernelCCBEventKicker =
(*psDevInfo->pui32KernelCCBEventKicker + 1) & 0xFF;
OSWriteHWReg(psDevInfo->pvRegsBaseKM,
SGX_MP_CORE_SELECT(EUR_CR_EVENT_KICK, 0),
EUR_CR_EVENT_KICK_NOW_MASK);
+#endif
#if defined(PDUMP)
if (bFirstTime) {
+#if defined(SGX_FEATURE_MULTI_EVENT_KICK)
+ PDUMPREG(SGX_MP_CORE_SELECT(EUR_CR_EVENT_KICK2, 0), EUR_CR_EVENT_KICK2_NOW_MASK);
+#else
psDevInfo->ui32KernelCCBEventKickerDumpVal = 1;
PDUMPCOMMENTWITHFLAGS(PDUMP_FLAGS_CONTINUOUS,
"First increment of the SGX event kicker value\n");
@@ -366,6 +375,7 @@ PVRSRV_ERROR SGXInitialise(PVRSRV_SGXDEV_INFO * psDevInfo)
psKernelCCBEventKickerMemInfo));
PDUMPREG(SGX_MP_CORE_SELECT(EUR_CR_EVENT_KICK, 0),
EUR_CR_EVENT_KICK_NOW_MASK);
+#endif
bFirstTime = 0;
}
#endif