diff options
| author | Xianzhong <b07117@freescale.com> | 2013-03-26 21:42:38 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2013-03-28 21:11:54 +0800 |
| commit | 6f0460d8221f70d1a6c6152cfddf9ddc0fa9bf9d (patch) | |
| tree | 3861a3cac97d51a9c89f3d0f2e25f8cb20e4c30e /drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c | |
| parent | bd5372e2520c23d50c0a78bd09104b89ca1b523f (diff) | |
ENGR00255896 gpu4.6.9p11.1 kernel ehancement upgrade
This patch is generated on imx_android_jb4.2.2 branch
Signed-off-by: Xianzhong <b07117@freescale.com>
Acked-by: Lily Zhang
Diffstat (limited to 'drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c b/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c index 7d7dedd49dd3..6e1457566771 100644 --- a/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c +++ b/drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c @@ -748,7 +748,7 @@ gckHARDWARE_Construct( /* Initialize the fast clear. */ gcmkONERROR(gckHARDWARE_SetFastClear(hardware, -1, -1)); -#if !gcdENABLE_128B_MERGE +#if !gcdENABLE_128B_MERGE if (((((gctUINT32) (hardware->identity.chipMinorFeatures2)) >> (0 ? 21:21) & ((gctUINT32) ((((1 ? 21:21) - (0 ? 21:21) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 21:21) - (0 ? 21:21) + 1)))))) == (0x1 & ((gctUINT32) ((((1 ? 21:21) - (0 ? 21:21) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 21:21) - (0 ? 21:21) + 1)))))))) { @@ -1024,7 +1024,7 @@ gckHARDWARE_InitializeHardware( 0x00424, baseAddress)); -#if !VIVANTE_PROFILER +#if !VIVANTE_PROFILER { gctUINT32 data; |