Mesa (master): nv50_2d,nvc0_2d: Document SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP from rnndb

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: bc69e7341539192f80fceb5c40a77718d31c03db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc69e7341539192f80fceb5c40a77718d31c03db

Author: Rhys Kidd <rhyskidd at gmail.com>
Date:   Thu Jul 16 01:10:12 2020 +1000

nv50_2d,nvc0_2d: Document SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP from rnndb

Present in both cl502d and cl902d.

Based on envytools commit 0b9d3e717828a06be6937395464c34dfc870a6dc

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5922>

---

 src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h | 4 ++--
 src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +-
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
index 475f8da63a8..b552e937fc5 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
+++ b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
@@ -8,7 +8,7 @@ https://github.com/envytools/envytools/
 git clone https://github.com/envytools/envytools.git
 
 The rules-ng-ng source files this header was generated from are:
-- rnndb/graph/g80_2d.xml         (  11609 bytes, from 2020-07-15 13:41:28)
+- rnndb/graph/g80_2d.xml         (  11616 bytes, from 2020-07-15 14:40:08)
 - rnndb/copyright.xml            (   6431 bytes, from 2020-07-11 09:17:41)
 - rnndb/fifo/nv_object.xml       (  16105 bytes, from 2020-07-11 09:17:37)
 - rnndb-generated/nvchipsets.xml (   3335 bytes, from 2020-06-09 15:36:30)
@@ -401,7 +401,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV50_2D_UNK0884						0x00000884
 
-#define NV50_2D_UNK0888						0x00000888
+#define NV50_2D_SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP		0x00000888
 
 #define NV50_2D_BLIT_CONTROL					0x0000088c
 #define NV50_2D_BLIT_CONTROL_ORIGIN__MASK			0x00000001
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 3f8e0dbc42c..7742ce0e14b 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -657,7 +657,7 @@ nv50_screen_init_hwctx(struct nv50_screen *screen)
    PUSH_DATA (push, 0);
    BEGIN_NV04(push, NV50_2D(COLOR_KEY_ENABLE), 1);
    PUSH_DATA (push, 0);
-   BEGIN_NV04(push, SUBC_2D(0x0888), 1);
+   BEGIN_NV04(push, NV50_2D(SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP), 1);
    PUSH_DATA (push, 1);
    BEGIN_NV04(push, NV50_2D(COND_MODE), 1);
    PUSH_DATA (push, NV50_2D_COND_MODE_ALWAYS);
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 2f0e92e6c29..4e8ee630daf 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -1152,7 +1152,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    PUSH_DATA (push, 0);
    BEGIN_NVC0(push, SUBC_2D(0x0884), 1);
    PUSH_DATA (push, 0x3f);
-   BEGIN_NVC0(push, SUBC_2D(0x0888), 1);
+   BEGIN_NVC0(push, NVC0_2D(SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP), 1);
    PUSH_DATA (push, 1);
    BEGIN_NVC0(push, NVC0_2D(COND_MODE), 1);
    PUSH_DATA (push, NV50_2D_COND_MODE_ALWAYS);