diff options
Diffstat (limited to 'drivers/gpu/pvr/services4')
| -rwxr-xr-x | drivers/gpu/pvr/services4/srvkm/common/pvrsrv.c | 11 | ||||
| -rwxr-xr-x | drivers/gpu/pvr/services4/srvkm/devices/sgx/sgxinit.c | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/drivers/gpu/pvr/services4/srvkm/common/pvrsrv.c b/drivers/gpu/pvr/services4/srvkm/common/pvrsrv.c index ea1fcaf319d..dcbc09ff677 100755 --- a/drivers/gpu/pvr/services4/srvkm/common/pvrsrv.c +++ b/drivers/gpu/pvr/services4/srvkm/common/pvrsrv.c @@ -172,19 +172,24 @@ PVRSRV_ERROR FreeDeviceID(SYS_DATA *psSysData, IMG_UINT32 ui32DevID) ******************************************************************************/ IMG_VOID IMG_CALLCONV PVRSRVCompatCheckKM(PVRSRV_BRIDGE_IN_COMPAT_CHECK *psUserModeDDKDetails, PVRSRV_BRIDGE_RETURN *psRetOUT) { +#if defined(MOT_BUILD) + IMG_UINT32 ui32DDKBuild = PVRVERSION_MOTBUILD; +#else + IMG_UINT32 ui32DDKBuild = PVRVERSION_BUILD; +#endif if(psUserModeDDKDetails->ui32DDKVersion != ((PVRVERSION_MAJ << 16) | (PVRVERSION_MIN << 8)) - || (psUserModeDDKDetails->ui32DDKBuild != PVRVERSION_BUILD)) + || (psUserModeDDKDetails->ui32DDKBuild != ui32DDKBuild)) { psRetOUT->eError = PVRSRV_ERROR_DDK_VERSION_MISMATCH; PVR_DPF((PVR_DBG_ERROR, "(FAIL) UM-KM DDK Mismatch UM-(%d) KM-(%d).", - psUserModeDDKDetails->ui32DDKBuild, PVRVERSION_BUILD)); + psUserModeDDKDetails->ui32DDKBuild, ui32DDKBuild)); } else { psRetOUT->eError = PVRSRV_OK; PVR_DPF((PVR_DBG_MESSAGE, "UM DDK-(%d) and KM DDK-(%d) match. [ OK ]", - psUserModeDDKDetails->ui32DDKBuild ,PVRVERSION_BUILD)); + psUserModeDDKDetails->ui32DDKBuild, ui32DDKBuild)); } } diff --git a/drivers/gpu/pvr/services4/srvkm/devices/sgx/sgxinit.c b/drivers/gpu/pvr/services4/srvkm/devices/sgx/sgxinit.c index 04b1748448e..778e5335574 100755 --- a/drivers/gpu/pvr/services4/srvkm/devices/sgx/sgxinit.c +++ b/drivers/gpu/pvr/services4/srvkm/devices/sgx/sgxinit.c @@ -3333,7 +3333,11 @@ PVRSRV_ERROR SGXGetMiscInfoKM(PVRSRV_SGXDEV_INFO *psDevInfo, psSGXFeatures->ui32DDKVersion = (PVRVERSION_MAJ << 16) | (PVRVERSION_MIN << 8); +#if defined(MOT_BUILD) + psSGXFeatures->ui32DDKBuild = PVRVERSION_MOTBUILD; +#else psSGXFeatures->ui32DDKBuild = PVRVERSION_BUILD; +#endif /* Also report the kernel module build options -- used in SGXConnectionCheck() */ psSGXFeatures->ui32BuildOptions = (SGX_BUILD_OPTIONS); |