From abd640763d6b49b7857b37208ecd91e77a9c561e Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 5 Nov 2011 12:08:05 +1000
Subject: [PATCH] --- yaml --- r: 282612 b: refs/heads/master c:
 0f0f7be8bdfc31f21b4a6b7e02a63b1b26b00123 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc   | 2 +-
 trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc.h | 2 +-
 trunk/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f42f8754de58..2a8cbb3a4921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 971fa6b46df2edc02c9937938d9ba1d6d6724e74
+refs/heads/master: 0f0f7be8bdfc31f21b4a6b7e02a63b1b26b00123
diff --git a/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc b/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc
index 0cec534f03e9..abc36626fef0 100644
--- a/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc
+++ b/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc
@@ -150,7 +150,7 @@ main:
    mov $r1 0x400
    movw $r2 0xfff3
    sethi $r2 0
-   iowr I[$r2 + 0x300] $r2
+   iowr I[$r1 + 0x300] $r2
 
    // enable interrupts
    or $r2 0xc
diff --git a/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc.h b/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc.h
index 2731de22ebe9..1f33fbdc00be 100644
--- a/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc.h
+++ b/trunk/drivers/gpu/drm/nouveau/nva3_copy.fuc.h
@@ -152,7 +152,7 @@ uint32_t nva3_pcopy_code[] = {
 	0xf10010fe,
 	0xf1040017,
 	0xf0fff327,
-	0x22d00023,
+	0x12d00023,
 	0x0c25f0c0,
 	0xf40012d0,
 	0x17f11031,
diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h b/trunk/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h
index 419903880e9d..a8d17458ced1 100644
--- a/trunk/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h
+++ b/trunk/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h
@@ -145,7 +145,7 @@ uint32_t nvc0_pcopy_code[] = {
 	0xf10010fe,
 	0xf1040017,
 	0xf0fff327,
-	0x22d00023,
+	0x12d00023,
 	0x0c25f0c0,
 	0xf40012d0,
 	0x17f11031,