Module: Mesa
Branch: master
Commit: b7f18e49b75dc139122cc58c273f44392fcd11e0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7f18e49b75dc139122cc58c273f44392fcd11e0
Author: Rob Clark <robdcl...@gmail.com>
Date: Wed Aug 15 14:01:46 2018 -0400
freedreno: update generated headers
Signed-off-by: Rob Clark <robdcl...@gmail.com>
---
src/gallium/drivers/freedreno/a2xx/a2xx.xml.h | 6 +++---
src/gallium/drivers/freedreno/a3xx/a3xx.xml.h | 6 +++---
src/gallium/drivers/freedreno/a4xx/a4xx.xml.h | 6 +++---
src/gallium/drivers/freedreno/a5xx/a5xx.xml.h | 6 +++---
src/gallium/drivers/freedreno/a6xx/a6xx.xml.h | 17 +++++++++++------
src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 2 +-
src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 4 ++--
src/gallium/drivers/freedreno/adreno_common.xml.h | 6 +++---
src/gallium/drivers/freedreno/adreno_pm4.xml.h | 6 +++---
9 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
index 28afd9a6cd..53ac4d7910 100644
--- a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
+++ b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
diff --git a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
index 2281306836..20a9a893b7 100644
--- a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
+++ b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
diff --git a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
index 49f06a286d..c7cb96bfea 100644
--- a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
+++ b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
diff --git a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
index b23305b27b..d5f130a5a7 100644
--- a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
+++ b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
diff --git a/src/gallium/drivers/freedreno/a6xx/a6xx.xml.h
b/src/gallium/drivers/freedreno/a6xx/a6xx.xml.h
index b1a03f7ff7..ec538f15d4 100644
--- a/src/gallium/drivers/freedreno/a6xx/a6xx.xml.h
+++ b/src/gallium/drivers/freedreno/a6xx/a6xx.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
@@ -2318,6 +2318,9 @@ static inline uint32_t A6XX_GRAS_SU_POINT_SIZE(float val)
return ((((int32_t)(val * 16.0))) << A6XX_GRAS_SU_POINT_SIZE__SHIFT) &
A6XX_GRAS_SU_POINT_SIZE__MASK;
}
+#define REG_A6XX_GRAS_SU_DEPTH_PLANE_CNTL 0x00008094
+#define A6XX_GRAS_SU_DEPTH_PLANE_CNTL_FRAG_WRITES_Z 0x00000001
+
#define REG_A6XX_GRAS_SU_POLY_OFFSET_SCALE 0x00008095
#define A6XX_GRAS_SU_POLY_OFFSET_SCALE__MASK 0xffffffff
#define A6XX_GRAS_SU_POLY_OFFSET_SCALE__SHIFT 0
@@ -2861,7 +2864,6 @@ static inline uint32_t
A6XX_RB_MRT_BUF_INFO_COLOR_SWAP(enum a3xx_color_swap val)
{
return ((val) << A6XX_RB_MRT_BUF_INFO_COLOR_SWAP__SHIFT) &
A6XX_RB_MRT_BUF_INFO_COLOR_SWAP__MASK;
}
-#define A6XX_RB_MRT_BUF_INFO_COLOR_SRGB
0x00008000
static inline uint32_t REG_A6XX_RB_MRT_PITCH(uint32_t i0) { return 0x00008823
+ 0x8*i0; }
#define A6XX_RB_MRT_PITCH__MASK
0xffffffff
@@ -2949,6 +2951,9 @@ static inline uint32_t
A6XX_RB_BLEND_CNTL_SAMPLE_MASK(uint32_t val)
return ((val) << A6XX_RB_BLEND_CNTL_SAMPLE_MASK__SHIFT) &
A6XX_RB_BLEND_CNTL_SAMPLE_MASK__MASK;
}
+#define REG_A6XX_RB_DEPTH_PLANE_CNTL 0x00008870
+#define A6XX_RB_DEPTH_PLANE_CNTL_FRAG_WRITES_Z 0x00000001
+
#define REG_A6XX_RB_DEPTH_CNTL 0x00008871
#define A6XX_RB_DEPTH_CNTL_Z_ENABLE 0x00000001
#define A6XX_RB_DEPTH_CNTL_Z_WRITE_ENABLE 0x00000002
@@ -3426,7 +3431,8 @@ static inline uint32_t
A6XX_VPC_CNTL_0_NUMNONPOSVAR(uint32_t val)
#define A6XX_VPC_SO_BUF_CNTL_BUF3 0x00000200
#define A6XX_VPC_SO_BUF_CNTL_ENABLE 0x00008000
-#define REG_A6XX_VPC_UNKNOWN_9306 0x00009306
+#define REG_A6XX_VPC_SO_OVERRIDE 0x00009306
+#define A6XX_VPC_SO_OVERRIDE_SO_DISABLE
0x00000001
#define REG_A6XX_VPC_UNKNOWN_9600 0x00009600
@@ -4035,7 +4041,6 @@ static inline uint32_t
A6XX_SP_FS_MRT_REG_COLOR_FORMAT(enum a6xx_color_fmt val)
}
#define A6XX_SP_FS_MRT_REG_COLOR_SINT 0x00000100
#define A6XX_SP_FS_MRT_REG_COLOR_UINT 0x00000200
-#define A6XX_SP_FS_MRT_REG_COLOR_SRGB 0x00000400
#define REG_A6XX_SP_UNKNOWN_A99E 0x0000a99e
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
index f1dd081ebc..c526a180a6 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
@@ -997,7 +997,7 @@ t7 opcode: CP_WAIT_FOR_IDLE (26) (1 dwords)
WRITE(REG_A6XX_VPC_UNKNOWN_9236, 1);
WRITE(REG_A6XX_VPC_UNKNOWN_9300, 0);
- WRITE(REG_A6XX_VPC_UNKNOWN_9306, 1);
+ WRITE(REG_A6XX_VPC_SO_OVERRIDE, A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
WRITE(REG_A6XX_PC_UNKNOWN_9801, 0);
WRITE(REG_A6XX_PC_UNKNOWN_9806, 0);
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
index 9a51b1c460..dd0f16a2bc 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c
@@ -505,8 +505,8 @@ fd6_emit_tile_prep(struct fd_batch *batch, struct fd_tile
*tile)
set_window_offset(ring, x1, y1);
- OUT_PKT4(ring, REG_A6XX_VPC_UNKNOWN_9306, 1);
- OUT_RING(ring, 1);
+ OUT_PKT4(ring, REG_A6XX_VPC_SO_OVERRIDE, 1);
+ OUT_RING(ring, A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
if (use_hw_binning(batch)) {
struct fd_vsc_pipe *pipe = &ctx->vsc_pipe[tile->p];
diff --git a/src/gallium/drivers/freedreno/adreno_common.xml.h
b/src/gallium/drivers/freedreno/adreno_common.xml.h
index 00cde777b6..877355c1be 100644
--- a/src/gallium/drivers/freedreno/adreno_common.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_common.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
diff --git a/src/gallium/drivers/freedreno/adreno_pm4.xml.h
b/src/gallium/drivers/freedreno/adreno_pm4.xml.h
index 1bf4e2d458..fe96a1381f 100644
--- a/src/gallium/drivers/freedreno/adreno_pm4.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_pm4.xml.h
@@ -12,11 +12,11 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes,
from 2018-07-03 19:37:13)
-- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-14 22:24:38)
-- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102772 bytes,
from 2018-08-14 22:24:38)
+- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes,
from 2018-08-17 13:46:53)
+- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 102966 bytes,
from 2018-08-17 13:46:53)
- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes,
from 2018-07-03 19:37:13)
- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes,
from 2018-07-03 19:37:13)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
