summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/drivers/etnaviv/hw
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-09-22 02:09:17 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-09-22 02:09:17 +0000
commit865c23c9c56f47f6cf8d73e8a6060a0c33a28b93 (patch)
treeaeed22bc39ce87dd6f09ff173c8273beaef65fe7 /lib/mesa/src/gallium/drivers/etnaviv/hw
parent27e7bb02bd0f89f96d9e3b402b46c2c97ee4defe (diff)
Merge Mesa 20.0.8
With Mesa 20.1 even after the kernel change to do wbinvd on all cpus sthen@ reported that hard hangs still occurred on his Haswell system with inteldrm. Mark Kane also reported seeing hangs on Ivy Bridge on bugs@. Some systems/workloads seem to be more prone to triggering this than others as I have not seen any hangs on Ivy Bridge and the only hangs I saw on Haswell when running piglit went away with the wbinvd change. It seems something is wrong with drm memory attributes or coherency in the kernel and newer Mesa versions expect behaviour we don't have.
Diffstat (limited to 'lib/mesa/src/gallium/drivers/etnaviv/hw')
-rw-r--r--lib/mesa/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h6
-rw-r--r--lib/mesa/src/gallium/drivers/etnaviv/hw/common.xml.h10
-rw-r--r--lib/mesa/src/gallium/drivers/etnaviv/hw/isa.xml.h6
-rw-r--r--lib/mesa/src/gallium/drivers/etnaviv/hw/state.xml.h24
-rw-r--r--lib/mesa/src/gallium/drivers/etnaviv/hw/state_3d.xml.h28
5 files changed, 37 insertions, 37 deletions
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/lib/mesa/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
index bfab93869..002b94b03 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
@@ -8,9 +8,9 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are:
-- cmdstream.xml ( 16930 bytes, from 2019-01-04 11:37:39)
-- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
-- common.xml ( 35468 bytes, from 2020-01-04 20:02:31)
+- cmdstream.xml ( 16930 bytes, from 2019-01-07 09:52:31)
+- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
+- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/hw/common.xml.h b/lib/mesa/src/gallium/drivers/etnaviv/hw/common.xml.h
index 44c458541..81e855bd3 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/hw/common.xml.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/hw/common.xml.h
@@ -8,12 +8,12 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are:
-- texdesc_3d.xml ( 3183 bytes, from 2018-02-10 13:09:26)
-- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
-- common.xml ( 35468 bytes, from 2020-01-04 20:02:31)
-- common_3d.xml ( 15058 bytes, from 2020-04-17 16:31:50)
+- texdesc_3d.xml ( 3183 bytes, from 2019-01-07 09:52:31)
+- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
+- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
+- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07)
-Copyright (C) 2012-2020 by the following authors:
+Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/hw/isa.xml.h b/lib/mesa/src/gallium/drivers/etnaviv/hw/isa.xml.h
index b75e6e393..b5bf753c0 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/hw/isa.xml.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/hw/isa.xml.h
@@ -8,10 +8,10 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are:
-- isa.xml ( 38205 bytes, from 2020-01-10 14:36:29)
-- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
+- isa.xml ( 38205 bytes, from 2019-08-19 14:35:07)
+- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
-Copyright (C) 2012-2020 by the following authors:
+Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/hw/state.xml.h b/lib/mesa/src/gallium/drivers/etnaviv/hw/state.xml.h
index 20cccfc7d..d29627999 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/hw/state.xml.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/hw/state.xml.h
@@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are:
-- state.xml ( 26877 bytes, from 2020-02-14 10:19:56)
-- common.xml ( 35468 bytes, from 2020-01-04 20:02:31)
-- common_3d.xml ( 15058 bytes, from 2020-04-17 16:31:50)
-- state_hi.xml ( 34851 bytes, from 2020-04-17 16:25:34)
-- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
-- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26)
-- state_3d.xml ( 83771 bytes, from 2020-04-17 17:15:55)
-- state_blt.xml ( 14252 bytes, from 2020-01-10 14:36:29)
-- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26)
-
-Copyright (C) 2012-2020 by the following authors:
+- state.xml ( 26666 bytes, from 2019-08-19 14:35:07)
+- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
+- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07)
+- state_hi.xml ( 30232 bytes, from 2019-01-07 09:52:31)
+- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
+- state_2d.xml ( 51552 bytes, from 2019-01-07 09:52:31)
+- state_3d.xml ( 83505 bytes, from 2019-08-19 14:46:17)
+- state_blt.xml ( 14252 bytes, from 2019-08-19 14:35:07)
+- state_vg.xml ( 5975 bytes, from 2019-01-07 09:52:31)
+
+Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
@@ -379,7 +379,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_GL_OCCLUSION_QUERY_CONTROL 0x00003830
-#define VIVS_GL_VARYING_NUM_COMPONENTS2 0x00003834
+#define VIVS_GL_UNK03834 0x00003834
#define VIVS_GL_UNK03838 0x00003838
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/lib/mesa/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index 7c0c60767..15bf478b9 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/lib/mesa/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -8,15 +8,15 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are:
-- state.xml ( 26877 bytes, from 2020-02-14 10:19:56)
-- common.xml ( 35468 bytes, from 2020-01-04 20:02:31)
-- common_3d.xml ( 15058 bytes, from 2020-04-17 16:31:50)
-- state_hi.xml ( 34851 bytes, from 2020-04-17 16:25:34)
-- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
-- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26)
-- state_3d.xml ( 83771 bytes, from 2020-04-17 17:15:55)
-- state_blt.xml ( 14252 bytes, from 2020-01-10 14:36:29)
-- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26)
+- state.xml ( 26666 bytes, from 2019-08-12 13:32:55)
+- common.xml ( 35468 bytes, from 2019-08-09 17:16:20)
+- common_3d.xml ( 15058 bytes, from 2019-09-12 20:37:35)
+- state_hi.xml ( 30552 bytes, from 2020-01-06 02:44:00)
+- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08)
+- state_2d.xml ( 51552 bytes, from 2019-08-09 17:34:00)
+- state_3d.xml ( 83644 bytes, from 2020-01-06 02:44:06)
+- state_blt.xml ( 14252 bytes, from 2019-09-12 20:21:39)
+- state_vg.xml ( 5975 bytes, from 2019-08-09 17:33:52)
Copyright (C) 2012-2020 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
@@ -1025,9 +1025,9 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK__MASK)
#define VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK_MASK 0x00000100
#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16_MASK 0x00000200
-#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__MASK 0xffff0000
-#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__SHIFT 16
-#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__MASK)
+#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16__MASK 0xffff0000
+#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16__SHIFT 16
+#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_UNK16__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_UNK16__MASK)
#define VIVS_PE_LOGIC_OP 0x000014a4
#define VIVS_PE_LOGIC_OP_OP__MASK 0x0000000f
@@ -1795,7 +1795,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_DESCRIPTOR_SAMP_LOD_BIAS_MIRROR(i0) (0x00016600 + 0x4*(i0))
-#define VIVS_NTE_DESCRIPTOR_SAMP_ANISOTROPY_MIRROR(i0) (0x00016800 + 0x4*(i0))
+#define VIVS_NTE_DESCRIPTOR_UNK17400_MIRROR(i0) (0x00016800 + 0x4*(i0))
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0(i0) (0x00016c00 + 0x4*(i0))
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_UWRAP__MASK 0x00000007
@@ -1846,7 +1846,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_DESCRIPTOR_SAMP_LOD_BIAS_BIAS(x) (((x) << VIVS_NTE_DESCRIPTOR_SAMP_LOD_BIAS_BIAS__SHIFT) & VIVS_NTE_DESCRIPTOR_SAMP_LOD_BIAS_BIAS__MASK)
#define VIVS_NTE_DESCRIPTOR_SAMP_LOD_BIAS_ENABLE 0x00010000
-#define VIVS_NTE_DESCRIPTOR_SAMP_ANISOTROPY(i0) (0x00017400 + 0x4*(i0))
+#define VIVS_NTE_DESCRIPTOR_UNK17400(i0) (0x00017400 + 0x4*(i0))
#define VIVS_SH 0x00000000
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 18:10:53 +0000