aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlistair Strachan <alistair.strachan@imgtec.com>2011-09-02 16:25:54 +0100
committerErik Gilling <konkers@android.com>2011-09-02 09:26:51 -0700
commit159c5ee0e760180668cb411ed068490890418865 (patch)
tree469744d5573e5857788660bdf02dbf0fc2f23119 /drivers/gpu
parenta2e866ea49cb44c8504f13ef214e21ff69c243a5 (diff)
downloadkernel_samsung_tuna-159c5ee0e760180668cb411ed068490890418865.zip
kernel_samsung_tuna-159c5ee0e760180668cb411ed068490890418865.tar.gz
kernel_samsung_tuna-159c5ee0e760180668cb411ed068490890418865.tar.bz2
gpu: pvr: Update to DDK 1.8@288777
This is a version number change only, which is required for compatibility with the user-mode driver. Change-Id: I4da36848fcab10fda020b8261f19ab55d089bbb6
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/pvr/pvrsrv.c3
-rw-r--r--drivers/gpu/pvr/pvrversion.h6
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/pvrsrv.c b/drivers/gpu/pvr/pvrsrv.c
index 1b6071d..1b730f5 100644
--- a/drivers/gpu/pvr/pvrsrv.c
+++ b/drivers/gpu/pvr/pvrsrv.c
@@ -41,8 +41,6 @@
#include "lists.h"
-#include <linux/module.h>
-
IMG_UINT32 g_ui32InitFlags;
#define INIT_DATA_ENABLE_PDUMPINIT 0x1U
@@ -1226,6 +1224,7 @@ IMG_VOID IMG_CALLCONV PVRSRVMISR(IMG_VOID *pvSysData)
}
}
+
IMG_EXPORT
PVRSRV_ERROR IMG_CALLCONV PVRSRVProcessConnect(IMG_UINT32 ui32PID, IMG_UINT32 ui32Flags)
{
diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h
index f501462..542884a 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 279068
+#define PVRVERSION_BUILD 288777
#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 27
-#define PVRVERSION_BUILD_LO 9068
+#define PVRVERSION_BUILD_HI 28
+#define PVRVERSION_BUILD_LO 8777
#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_ */