aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/pvr
diff options
context:
space:
mode:
authorAlistair Strachan <alistair.strachan@imgtec.com>2012-03-09 17:09:17 +0000
committerJP Abgrall <jpa@google.com>2012-03-14 18:24:22 -0700
commitb6e6bb8012ac19b7ba074e983ed87842ed13fa4a (patch)
tree19af93d87016379cf7d123fe83a06dc04af8a7f7 /drivers/gpu/pvr
parentb8f7c03589e2d0f0b98a56c80c4ee0f42ad40df8 (diff)
downloadkernel_samsung_crespo-b6e6bb8012ac19b7ba074e983ed87842ed13fa4a.zip
kernel_samsung_crespo-b6e6bb8012ac19b7ba074e983ed87842ed13fa4a.tar.gz
kernel_samsung_crespo-b6e6bb8012ac19b7ba074e983ed87842ed13fa4a.tar.bz2
gpu: pvr: Update to DDK 1.8@840215
Change-Id: I899b6a4ed9e88a0e5c4c2e426aee4e11de846a14
Diffstat (limited to 'drivers/gpu/pvr')
-rw-r--r--drivers/gpu/pvr/module.c14
-rw-r--r--drivers/gpu/pvr/pvrversion.h6
2 files changed, 16 insertions, 4 deletions
diff --git a/drivers/gpu/pvr/module.c b/drivers/gpu/pvr/module.c
index cc9334b..343ad30 100644
--- a/drivers/gpu/pvr/module.c
+++ b/drivers/gpu/pvr/module.c
@@ -79,6 +79,10 @@
#include <asm/uaccess.h>
#endif
+#if defined(PVR_LDM_MODULE) || defined(PVR_DRI_DRM_PLATFORM_DEV)
+#include <asm/atomic.h>
+#endif
+
#include "img_defs.h"
#include "services.h"
#include "kerneldisplay.h"
@@ -347,9 +351,17 @@ void PVRSRVDriverShutdown(struct drm_device *pDevice)
PVR_MOD_STATIC void PVRSRVDriverShutdown(LDM_DEV *pDevice)
#endif
{
+ static atomic_t sDriverIsShutdown = ATOMIC_INIT(1);
+
PVR_TRACE(("PVRSRVDriverShutdown(pDevice=%p)", pDevice));
- (void) PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D3);
+ if (atomic_dec_and_test(&sDriverIsShutdown))
+ {
+
+ LinuxLockMutex(&gPVRSRVLock);
+
+ (void) PVRSRVSetPowerStateKM(PVRSRV_SYS_POWER_STATE_D3);
+ }
}
#endif
diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h
index 831111b..7f3f9f9 100644
--- a/drivers/gpu/pvr/pvrversion.h
+++ b/drivers/gpu/pvr/pvrversion.h
@@ -36,7 +36,7 @@
#define PVRVERSION_FAMILY "sgxddk"
#define PVRVERSION_BRANCHNAME "1.8"
-#define PVRVERSION_BUILD 813213
+#define PVRVERSION_BUILD 840215
#define PVRVERSION_BSCONTROL "CustomerGoogle_Android_ogles1_ogles2_GPL"
#define PVRVERSION_STRING "CustomerGoogle_Android_ogles1_ogles2_GPL sgxddk 18 1.8@" PVR_STR2(PVRVERSION_BUILD)
@@ -44,8 +44,8 @@
#define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved."
-#define PVRVERSION_BUILD_HI 81
-#define PVRVERSION_BUILD_LO 3213
+#define PVRVERSION_BUILD_HI 84
+#define PVRVERSION_BUILD_LO 215
#define PVRVERSION_STRING_NUMERIC PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO)
#endif /* _PVRVERSION_H_ */