Mesa (master): nvc0_2d: Document SET_PIXELS_FROM_MEMORY_CORRAL_SIZE from rnndb

[GitLab Mirror]

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

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

nvc0_2d: Document SET_PIXELS_FROM_MEMORY_CORRAL_SIZE from rnndb

Present in both cl502d and cl902d.

Based on envytools commit 889f8fb4445863c19336c31dd13ecbdd3b19a196

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 | 6 ++++--
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
index b552e937fc5..709c699a763 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         (  11616 bytes, from 2020-07-15 14:40:08)
+- rnndb/graph/g80_2d.xml         (  11684 bytes, from 2020-07-15 15:19:42)
 - 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)
@@ -399,7 +399,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV50_2D_UNK0880						0x00000880
 
-#define NV50_2D_UNK0884						0x00000884
+#define NV50_2D_SET_PIXELS_FROM_MEMORY_CORRAL_SIZE		0x00000884
+#define NV50_2D_SET_PIXELS_FROM_MEMORY_CORRAL_SIZE_V__MASK	0x0000003f
+#define NV50_2D_SET_PIXELS_FROM_MEMORY_CORRAL_SIZE_V__SHIFT	0
 
 #define NV50_2D_SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP		0x00000888
 
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 4e8ee630daf..05eb1a1053d 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -1150,7 +1150,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    PUSH_DATA (push, 0);
    BEGIN_NVC0(push, NVC0_2D(COLOR_KEY_ENABLE), 1);
    PUSH_DATA (push, 0);
-   BEGIN_NVC0(push, SUBC_2D(0x0884), 1);
+   BEGIN_NVC0(push, NVC0_2D(SET_PIXELS_FROM_MEMORY_CORRAL_SIZE), 1);
    PUSH_DATA (push, 0x3f);
    BEGIN_NVC0(push, NVC0_2D(SET_PIXELS_FROM_MEMORY_SAFE_OVERLAP), 1);
    PUSH_DATA (push, 1);