From b664b42fcebc8fc8b7ea7d9e95be4e3e3f7b5789 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:06 -0600
Subject: [PATCH] nouveau/mme: Don't swap x and y in mme_fermi_merge_to()

This was probably an artifact of the fermi/turing merge.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/mme/mme_fermi_builder.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nouveau/mme/mme_fermi_builder.c b/src/nouveau/mme/mme_fermi_builder.c
index 5d58ca5e771..e8874e5a3b8 100644
--- a/src/nouveau/mme/mme_fermi_builder.c
+++ b/src/nouveau/mme/mme_fermi_builder.c
@@ -725,8 +725,8 @@ mme_fermi_merge_to(struct mme_builder *b, struct mme_value dst,
    assert(bits < 32);
    assert(src_pos < 32);
 
-   struct mme_value y_reg = mme_fermi_value_as_reg(b, x);
-   struct mme_value x_reg = mme_fermi_value_as_reg(b, y);
+   struct mme_value x_reg = mme_fermi_value_as_reg(b, x);
+   struct mme_value y_reg = mme_fermi_value_as_reg(b, y);
 
    if (!mme_fermi_next_inst_can_fit_a_full_inst(fb))
       mme_fermi_new_inst(fb);