aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/pvr/deviceclass.c
diff options
context:
space:
mode:
authorHemant Hariyani <hemanthariyani@ti.com>2011-08-25 03:01:10 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:18:39 -0400
commitb7f68b0d0649bec8d50054b78873ca40b267321b (patch)
tree56e9917cfa159b1728721dbae9d8c46f33bc2699 /drivers/gpu/pvr/deviceclass.c
parent8827e270c06639a9a89390799c8860bf9640ec5f (diff)
OMAP4: SGX-KM: Upgrade DDK to version 1.7.17.4403
This patch upgrades the kernel side graphics driver to version 1.7.17.4403. The corresponding change in the user side must be in place for this to work. Change-Id: Id3a713fa22a227dbcd0ec098589d62b350802247 Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Diffstat (limited to 'drivers/gpu/pvr/deviceclass.c')
-rw-r--r--drivers/gpu/pvr/deviceclass.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/gpu/pvr/deviceclass.c b/drivers/gpu/pvr/deviceclass.c
index 0e4b51a57e0..7b565dd8168 100644
--- a/drivers/gpu/pvr/deviceclass.c
+++ b/drivers/gpu/pvr/deviceclass.c
@@ -258,7 +258,7 @@ PVRSRV_ERROR PVRSRVRegisterDCDeviceKM (PVRSRV_DC_SRV2DISP_KMJTABLE *psFuncTable,
258 *psDCInfo->psFuncTable = *psFuncTable; 258 *psDCInfo->psFuncTable = *psFuncTable;
259 259
260 260
261 if(OSAllocMem( PVRSRV_OS_PAGEABLE_HEAP, 261 if(OSAllocMem( PVRSRV_OS_NON_PAGEABLE_HEAP,
262 sizeof(PVRSRV_DEVICE_NODE), 262 sizeof(PVRSRV_DEVICE_NODE),
263 (IMG_VOID **)&psDeviceNode, IMG_NULL, 263 (IMG_VOID **)&psDeviceNode, IMG_NULL,
264 "Device Node") != PVRSRV_OK) 264 "Device Node") != PVRSRV_OK)
@@ -420,7 +420,7 @@ PVRSRV_ERROR PVRSRVRegisterBCDeviceKM (PVRSRV_BC_SRV2BUFFER_KMJTABLE *psFuncTabl
420 *psBCInfo->psFuncTable = *psFuncTable; 420 *psBCInfo->psFuncTable = *psFuncTable;
421 421
422 422
423 if(OSAllocMem( PVRSRV_OS_PAGEABLE_HEAP, 423 if(OSAllocMem( PVRSRV_OS_NON_PAGEABLE_HEAP,
424 sizeof(PVRSRV_DEVICE_NODE), 424 sizeof(PVRSRV_DEVICE_NODE),
425 (IMG_VOID **)&psDeviceNode, IMG_NULL, 425 (IMG_VOID **)&psDeviceNode, IMG_NULL,
426 "Device Node") != PVRSRV_OK) 426 "Device Node") != PVRSRV_OK)
@@ -540,19 +540,21 @@ PVRSRV_ERROR PVRSRVCloseDCDeviceKM (IMG_HANDLE hDeviceKM,
540 psDCPerContextInfo = (PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *)hDeviceKM; 540 psDCPerContextInfo = (PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *)hDeviceKM;
541 541
542 542
543 eError = ResManFreeResByPtr(psDCPerContextInfo->hResItem); 543 eError = ResManFreeResByPtr(psDCPerContextInfo->hResItem, CLEANUP_WITH_POLL);
544 544
545 return eError; 545 return eError;
546} 546}
547 547
548 548
549static PVRSRV_ERROR CloseDCDeviceCallBack(IMG_PVOID pvParam, 549static PVRSRV_ERROR CloseDCDeviceCallBack(IMG_PVOID pvParam,
550 IMG_UINT32 ui32Param) 550 IMG_UINT32 ui32Param,
551 IMG_BOOL bDummy)
551{ 552{
552 PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *psDCPerContextInfo; 553 PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *psDCPerContextInfo;
553 PVRSRV_DISPLAYCLASS_INFO *psDCInfo; 554 PVRSRV_DISPLAYCLASS_INFO *psDCInfo;
554 555
555 PVR_UNREFERENCED_PARAMETER(ui32Param); 556 PVR_UNREFERENCED_PARAMETER(ui32Param);
557 PVR_UNREFERENCED_PARAMETER(bDummy);
556 558
557 psDCPerContextInfo = (PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *)pvParam; 559 psDCPerContextInfo = (PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *)pvParam;
558 psDCInfo = psDCPerContextInfo->psDCInfo; 560 psDCInfo = psDCPerContextInfo->psDCInfo;
@@ -812,7 +814,7 @@ PVRSRV_ERROR PVRSRVDestroyDCSwapChainKM(IMG_HANDLE hSwapChainRef)
812 814
813 psSwapChainRef = hSwapChainRef; 815 psSwapChainRef = hSwapChainRef;
814 816
815 eError = ResManFreeResByPtr(psSwapChainRef->hResItem); 817 eError = ResManFreeResByPtr(psSwapChainRef->hResItem, CLEANUP_WITH_POLL);
816 818
817 return eError; 819 return eError;
818} 820}
@@ -880,13 +882,16 @@ static PVRSRV_ERROR DestroyDCSwapChain(PVRSRV_DC_SWAPCHAIN *psSwapChain)
880} 882}
881 883
882 884
883static PVRSRV_ERROR DestroyDCSwapChainRefCallBack(IMG_PVOID pvParam, IMG_UINT32 ui32Param) 885static PVRSRV_ERROR DestroyDCSwapChainRefCallBack(IMG_PVOID pvParam,
886 IMG_UINT32 ui32Param,
887 IMG_BOOL bDummy)
884{ 888{
885 PVRSRV_DC_SWAPCHAIN_REF *psSwapChainRef = (PVRSRV_DC_SWAPCHAIN_REF *) pvParam; 889 PVRSRV_DC_SWAPCHAIN_REF *psSwapChainRef = (PVRSRV_DC_SWAPCHAIN_REF *) pvParam;
886 PVRSRV_ERROR eError = PVRSRV_OK; 890 PVRSRV_ERROR eError = PVRSRV_OK;
887 IMG_UINT32 i; 891 IMG_UINT32 i;
888 892
889 PVR_UNREFERENCED_PARAMETER(ui32Param); 893 PVR_UNREFERENCED_PARAMETER(ui32Param);
894 PVR_UNREFERENCED_PARAMETER(bDummy);
890 895
891 for (i = 0; i < psSwapChainRef->psSwapChain->ui32BufferCount; i++) 896 for (i = 0; i < psSwapChainRef->psSwapChain->ui32BufferCount; i++)
892 { 897 {
@@ -1705,20 +1710,22 @@ PVRSRV_ERROR PVRSRVCloseBCDeviceKM (IMG_HANDLE hDeviceKM,
1705 psBCPerContextInfo = (PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *)hDeviceKM; 1710 psBCPerContextInfo = (PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *)hDeviceKM;
1706 1711
1707 1712
1708 eError = ResManFreeResByPtr(psBCPerContextInfo->hResItem); 1713 eError = ResManFreeResByPtr(psBCPerContextInfo->hResItem, CLEANUP_WITH_POLL);
1709 1714
1710 return eError; 1715 return eError;
1711} 1716}
1712 1717
1713 1718
1714static PVRSRV_ERROR CloseBCDeviceCallBack(IMG_PVOID pvParam, 1719static PVRSRV_ERROR CloseBCDeviceCallBack(IMG_PVOID pvParam,
1715 IMG_UINT32 ui32Param) 1720 IMG_UINT32 ui32Param,
1721 IMG_BOOL bDummy)
1716{ 1722{
1717 PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *psBCPerContextInfo; 1723 PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *psBCPerContextInfo;
1718 PVRSRV_BUFFERCLASS_INFO *psBCInfo; 1724 PVRSRV_BUFFERCLASS_INFO *psBCInfo;
1719 IMG_UINT32 i; 1725 IMG_UINT32 i;
1720 1726
1721 PVR_UNREFERENCED_PARAMETER(ui32Param); 1727 PVR_UNREFERENCED_PARAMETER(ui32Param);
1728 PVR_UNREFERENCED_PARAMETER(bDummy);
1722 1729
1723 psBCPerContextInfo = (PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *)pvParam; 1730 psBCPerContextInfo = (PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *)pvParam;
1724 1731