diff options
Diffstat (limited to 'drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c b/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c index a52c1c817560..22e1f27a5b5d 100644 --- a/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c +++ b/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_context.c @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (C) 2005 - 2012 by Vivante Corp. +* Copyright (C) 2005 - 2013 by Vivante Corp. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,9 +19,6 @@ *****************************************************************************/ - - - #include "gc_hal.h" #include "gc_hal_kernel.h" #include "gc_hal_kernel_context.h" @@ -474,7 +471,7 @@ _InitializeContextBuffer( index += _SwitchPipe(Context, index, gcvPIPE_3D); /* Current context pointer. */ -#if gcdDEBUG && 1 +#if gcdDEBUG index += _State(Context, index, 0x03850 >> 2, 0x00000000, 1, gcvFALSE, gcvFALSE); #endif @@ -1257,11 +1254,11 @@ gckCONTEXT_Construct( } /* Copy the current context. */ - gcmkONERROR(gckOS_MemCopy( + gckOS_MemCopy( tempContext->logical, currContext->logical, context->totalSize - )); + ); /* Get the next context buffer. */ tempContext = tempContext->next; @@ -1442,7 +1439,7 @@ gckCONTEXT_Update( gcmkONERROR(gckKERNEL_OpenUserData( kernel, needCopy, Context->recordArray, - kDelta->recordArray, Context->recordArraySize, + gcmUINT64_TO_PTR(kDelta->recordArray), Context->recordArraySize, (gctPOINTER *) &recordArray )); @@ -1551,13 +1548,13 @@ gckCONTEXT_Update( gcmkASSERT(kDelta->refCount >= 0); /* Get the next state delta. */ - nDelta = kDelta->next; + nDelta = gcmUINT64_TO_PTR(kDelta->next); /* Get access to the state records. */ gcmkONERROR(gckKERNEL_CloseUserData( kernel, needCopy, gcvFALSE, - kDelta->recordArray, Context->recordArraySize, + gcmUINT64_TO_PTR(kDelta->recordArray), Context->recordArraySize, (gctPOINTER *) &recordArray )); @@ -1704,7 +1701,7 @@ OnError: gcmkVERIFY_OK(gckKERNEL_CloseUserData( kernel, needCopy, gcvFALSE, - kDelta->recordArray, Context->recordArraySize, + gcmUINT64_TO_PTR(kDelta->recordArray), Context->recordArraySize, (gctPOINTER *) &recordArray )); } |