diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-22 11:42:18 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-22 11:42:18 +0200 |
| commit | 042098f2e54409eda6b7324277aabd31aa359e28 (patch) | |
| tree | 59242fb2e9e01a5fa318b6fa35caff9f9f5922db /drivers/gpu | |
| parent | 5505d2ca728d385469471cd765485be73b58a62b (diff) | |
| parent | 3b0c5d2887fca99cab7dd506817b1049d38198a1 (diff) | |
| download | kernel_samsung_crespo-042098f2e54409eda6b7324277aabd31aa359e28.zip kernel_samsung_crespo-042098f2e54409eda6b7324277aabd31aa359e28.tar.gz kernel_samsung_crespo-042098f2e54409eda6b7324277aabd31aa359e28.tar.bz2 | |
Merge remote-tracking branch 'google/android-samsung-3.0-jb' into EnviarKernelJellybean
Conflicts:
drivers/gpu/pvr/pvrversion.h
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/pvr/pvrversion.h | 10 | ||||
| -rw-r--r-- | drivers/gpu/pvr/sgx/mmu.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h index c3cc6b3..f282ad2 100644 --- a/drivers/gpu/pvr/pvrversion.h +++ b/drivers/gpu/pvr/pvrversion.h @@ -35,17 +35,17 @@ #define PVRVERSION_BRANCH 18 #define PVRVERSION_FAMILY "sgxddk" -#define PVRVERSION_BRANCHNAME "1.8" +#define PVRVERSION_BRANCHNAME "1.8.GOOGLENEXUS.ED945322" #define PVRVERSION_BUILD 2112805 #define PVRVERSION_BSCONTROL "CustomerGoogle_Android_ogles1_ogles2_GPL" -#define PVRVERSION_STRING "CustomerGoogle_Android_ogles1_ogles2_GPL sgxddk 18 1.8@" PVR_STR2(PVRVERSION_BUILD) -#define PVRVERSION_STRING_SHORT "1.8@" PVR_STR2(PVRVERSION_BUILD) +#define PVRVERSION_STRING "CustomerGoogle_Android_ogles1_ogles2_GPL sgxddk 18 1.8.GOOGLENEXUS.ED945322@" PVR_STR2(PVRVERSION_BUILD) +#define PVRVERSION_STRING_SHORT "1.8.GOOGLENEXUS.ED945322@" PVR_STR2(PVRVERSION_BUILD) #define COPYRIGHT_TXT "Copyright (c) Imagination Technologies Ltd. All Rights Reserved." -#define PVRVERSION_BUILD_HI 94 -#define PVRVERSION_BUILD_LO 5322 +#define PVRVERSION_BUILD_HI 211 +#define PVRVERSION_BUILD_LO 2805 #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_ */ diff --git a/drivers/gpu/pvr/sgx/mmu.c b/drivers/gpu/pvr/sgx/mmu.c index 9d124f5..cde8307 100644 --- a/drivers/gpu/pvr/sgx/mmu.c +++ b/drivers/gpu/pvr/sgx/mmu.c @@ -3471,6 +3471,8 @@ IMG_VOID MMU_CheckFaultAddr(PVRSRV_SGXDEV_INFO *psDevInfo, IMG_UINT32 ui32PDDevP ui32PTE, ui32PTE & SGX_MMU_PTE_ADDR_MASK, ui32PTE & SGX_MMU_PTE_VALID?"valid":"Invalid")); + + DumpPT(psMMUContext->apsPTInfoList[ui32PDIndex]); } else { |