Skip to content

Commit

Permalink
gpu: pvr: bypass compat check if version is same but build # is diffe…
Browse files Browse the repository at this point in the history
…rent

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
  • Loading branch information
imoseyon authored and Stratos Karafotis committed Jun 29, 2013
1 parent fbc814a commit e1f6bdb
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions drivers/gpu/pvr/sgx/sgxinit.c
Expand Up @@ -53,6 +53,8 @@
#include "srvkm.h"
#include "ttrace.h"

static int dddk = PVRVERSION_BUILD;

#if defined(PVRSRV_USSE_EDM_STATUS_DEBUG)

static const IMG_CHAR *SGXUKernelStatusString(IMG_UINT32 code)
Expand Down Expand Up @@ -2068,6 +2070,7 @@ PVRSRV_ERROR SGXDevInitCompatCheck(PVRSRV_DEVICE_NODE *psDeviceNode)
PVR_LOG(("(FAIL) SGXInit: Incompatible driver DDK revision (%d)/device DDK revision (%d).",
PVRVERSION_BUILD, psSGXFeatures->ui32DDKBuild));
eError = PVRSRV_ERROR_DDK_VERSION_MISMATCH;
dddk = psSGXFeatures->ui32DDKBuild;
goto chk_exit;
}
else
Expand Down Expand Up @@ -2184,6 +2187,13 @@ PVRSRV_ERROR SGXDevInitCompatCheck(PVRSRV_DEVICE_NODE *psDeviceNode)
#if defined(IGNORE_SGX_INIT_COMPATIBILITY_CHECK)
return PVRSRV_OK;
#else
#if !defined (NO_HARDWARE)
if( (psSGXFeatures->ui32DDKVersion == ((PVRVERSION_MAJ << 16) | (PVRVERSION_MIN << 8) |
PVRVERSION_BRANCH) )) {
psSGXFeatures->ui32DDKBuild = dddk;
eError = PVRSRV_OK;
}
#endif
return eError;
#endif
}
Expand Down Expand Up @@ -2635,8 +2645,7 @@ PVRSRV_ERROR SGXGetMiscInfoKM(PVRSRV_SGXDEV_INFO *psDevInfo,
(PVRVERSION_MAJ << 16) |
(PVRVERSION_MIN << 8) |
PVRVERSION_BRANCH;
psSGXFeatures->ui32DDKBuild = PVRVERSION_BUILD;

psSGXFeatures->ui32DDKBuild = dddk;

psSGXFeatures->ui32BuildOptions = (SGX_BUILD_OPTIONS);

Expand Down

0 comments on commit e1f6bdb

Please sign in to comment.