summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLoren Huang <b02279@freescale.com>2014-03-27 14:13:31 +0800
committerLoren Huang <b02279@freescale.com>2014-03-27 14:13:31 +0800
commit563931094bf096da2ce6f2cc40387f9e726b3342 (patch)
tree4e94fd459965b28195f5ed0282e775c98dcadbdc /drivers
parentc9d20c3e97d531a601855368465c86fcd1390ca1 (diff)
ENGR00302036-3 gpu:gpu2d may cause bus hang in some corner case
Vivante patch name: cl17466.17776.rls.lockup.2dhang(clear.blit) -Updated the outstanding request limit to 12. -Refined the 2D chip feature check. -Refine the 2D cache flush operation (avoid FE and PE access memory through the same port). -Enable cache flush for filterblt. -Dynamic enabling SPLIT_RECT by checking chip feature(disable for us) -Use brush stretch blt for clear operation. Date: Mar 26, 2014 Signed-off-by: Loren Huang <b02279@freescale.com> Acked-by: Shawn Guo
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mxc/gpu-viv/arch/XAQ2/hal/kernel/gc_hal_kernel_hardware.c61
-rw-r--r--drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h3
2 files changed, 44 insertions, 20 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 e8ad2ea3e031..60adbfe06cec 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
@@ -509,6 +509,36 @@ _IdentifyHardware(
Identity->varyingsCount -= 1;
}
+ Identity->chip2DControl = 0;
+ if (Identity->chipModel == gcv320)
+ {
+ gctUINT32 data;
+
+ gcmkONERROR(
+ gckOS_ReadRegisterEx(Os,
+ Core,
+ 0x0002C,
+ &data));
+
+ if ((data != 33956864) &&
+ ((Identity->chipRevision == 0x5007) ||
+ (Identity->chipRevision == 0x5220)))
+ {
+ Identity->chip2DControl |= 0xFF &
+ (Identity->chipRevision == 0x5220 ? 8 :
+ (Identity->chipRevision == 0x5007 ? 12 : 0));
+ }
+
+ if (Identity->chipRevision == 0x5007)
+ {
+ /* Disable splitting rectangle. */
+ Identity->chip2DControl |= 0x100;
+
+ /* Enable 2D Flush. */
+ Identity->chip2DControl |= 0x200;
+ }
+ }
+
/* Success. */
gcmkFOOTER();
return gcvSTATUS_OK;
@@ -1318,34 +1348,24 @@ gckHARDWARE_InitializeHardware(
gcmkONERROR(gckOS_WriteRegisterEx(Hardware->os, Hardware->core, 0x00414, axi_ot));
}
- if ((Hardware->identity.chipModel == gcv320)
- && ((Hardware->identity.chipRevision == 0x5007)
- || (Hardware->identity.chipRevision == 0x5220)))
- {
+ if (Hardware->identity.chip2DControl & 0xFF)
+ {
gctUINT32 data;
gcmkONERROR(
gckOS_ReadRegisterEx(Hardware->os,
Hardware->core,
- 0x0002C,
+ 0x00414,
&data));
- if (data != 33956864)
- {
- gcmkONERROR(
- gckOS_ReadRegisterEx(Hardware->os,
- Hardware->core,
- 0x00414,
- &data));
- data = ((((gctUINT32) (data)) & ~(((gctUINT32) (((gctUINT32) ((((1 ? 7:0) - (0 ? 7:0) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 7:0) - (0 ? 7:0) + 1))))))) << (0 ? 7:0))) | (((gctUINT32) ((gctUINT32) (Hardware->identity.chipRevision == 0x5220 ? 8 : (Hardware->identity.chipRevision == 0x5007 ? 16 : 0)) & ((gctUINT32) ((((1 ? 7:0) - (0 ? 7:0) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 7:0) - (0 ? 7:0) + 1))))))) << (0 ? 7:0)));
+ data = ((((gctUINT32) (data)) & ~(((gctUINT32) (((gctUINT32) ((((1 ? 7:0) - (0 ? 7:0) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 7:0) - (0 ? 7:0) + 1))))))) << (0 ? 7:0))) | (((gctUINT32) ((gctUINT32) (Hardware->identity.chip2DControl & 0xFF) & ((gctUINT32) ((((1 ? 7:0) - (0 ? 7:0) + 1) == 32) ? ~0 : (~(~0 << ((1 ? 7:0) - (0 ? 7:0) + 1))))))) << (0 ? 7:0)));
- gcmkONERROR(
- gckOS_WriteRegisterEx(Hardware->os,
- Hardware->core,
- 0x00414,
- data));
- }
- }
+ gcmkONERROR(
+ gckOS_WriteRegisterEx(Hardware->os,
+ Hardware->core,
+ 0x00414,
+ data));
+ }
/* Update GPU AXI cache atttribute. */
gcmkONERROR(gckOS_WriteRegisterEx(Hardware->os,
@@ -1553,6 +1573,7 @@ gckHARDWARE_QueryChipIdentity(
Identity->bufferSize = Hardware->identity.bufferSize;
Identity->varyingsCount = Hardware->identity.varyingsCount;
Identity->superTileMode = Hardware->identity.superTileMode;
+ Identity->chip2DControl = Hardware->identity.chip2DControl;
/* Success. */
gcmkFOOTER_NO();
diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
index ea86349dcf97..8397f89cb078 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
+++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h
@@ -257,6 +257,9 @@ typedef struct _gcsHAL_QUERY_CHIP_IDENTITY
/* Supertile layout style in hardware */
gctUINT32 superTileMode;
+
+ /* Special control bits for 2D chip. */
+ gctUINT32 chip2DControl;
}
gcsHAL_QUERY_CHIP_IDENTITY;