Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / gpu / drm / nouveau / nvkm / engine / gr / fuc / gpcgm107.fuc5.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
index 5136f91..fa9f3c0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
@@ -438,48 +438,49 @@ uint32_t gm107_grgpc_code[] = {
        0x0412fd20,
        0xfd01e4b6,
        0x18fe051e,
-       0x06447e00,
+       0x06487e00,
        0xd40ef400,
 /* 0x05a0: main_not_ctx_xfer */
        0xf010ef94,
        0xf87e01f5,
        0x0ef40002,
 /* 0x05ad: ih */
-       0xfe80f9c7,
-       0x80f90188,
-       0xa0f990f9,
-       0xd0f9b0f9,
-       0xf0f9e0f9,
-       0x004a04bd,
-       0x00aacf02,
-       0xf404abc4,
-       0x240d1f0b,
-       0xcf1a004e,
-       0x004f00ee,
-       0x00ffcf19,
-       0x0000047e,
-       0x0040010e,
-       0x000ef61d,
-/* 0x05ea: ih_no_fifo */
-       0x004004bd,
-       0x000af601,
-       0xf0fc04bd,
-       0xd0fce0fc,
-       0xa0fcb0fc,
-       0x80fc90fc,
-       0xfc0088fe,
-       0x0032f480,
-/* 0x060a: hub_barrier_done */
+       0xf900f9c7,
+       0x0188fe80,
+       0x90f980f9,
+       0xb0f9a0f9,
+       0xe0f9d0f9,
+       0x04bdf0f9,
+       0xcf02004a,
+       0xabc400aa,
+       0x1f0bf404,
+       0x004e240d,
+       0x00eecf1a,
+       0xcf19004f,
+       0x047e00ff,
+       0x010e0000,
+       0xf61d0040,
+       0x04bd000e,
+/* 0x05ec: ih_no_fifo */
+       0xf6010040,
+       0x04bd000a,
+       0xe0fcf0fc,
+       0xb0fcd0fc,
+       0x90fca0fc,
+       0x88fe80fc,
+       0xfc80fc00,
+       0x0032f400,
+/* 0x060e: hub_barrier_done */
        0x010f01f8,
        0xbb040e98,
        0xffb204fe,
        0x4094188e,
        0x00008f7e,
-/* 0x061e: ctx_redswitch */
+/* 0x0622: ctx_redswitch */
        0x200f00f8,
        0x01850080,
        0xbd000ff6,
-/* 0x062b: ctx_redswitch_delay */
+/* 0x062f: ctx_redswitch_delay */
        0xb6080e04,
        0x1bf401e2,
        0x00f5f1fd,
@@ -487,15 +488,15 @@ uint32_t gm107_grgpc_code[] = {
        0x85008002,
        0x000ff601,
        0x00f804bd,
-/* 0x0644: ctx_xfer */
+/* 0x0648: ctx_xfer */
        0x02810080,
        0xbd000ff6,
        0x1dc48e04,
        0x01e5f050,
        0x8f7effb2,
        0x11f40000,
-       0x061e7e07,
-/* 0x0661: ctx_xfer_not_load */
+       0x06227e07,
+/* 0x0665: ctx_xfer_not_load */
        0x02167e00,
        0x8024bd00,
        0xf60247fc,
@@ -550,15 +551,15 @@ uint32_t gm107_grgpc_code[] = {
        0x7e00020a,
        0xf4000314,
        0x12f40601,
-/* 0x0739: ctx_xfer_post */
+/* 0x073d: ctx_xfer_post */
        0x02277e1a,
        0x8e0d0f00,
        0xf0501da8,
        0xffb201e5,
        0x00008f7e,
        0x0003147e,
-/* 0x0750: ctx_xfer_done */
-       0x00060a7e,
+/* 0x0754: ctx_xfer_done */
+       0x00060e7e,
        0x000000f8,
        0x00000000,
        0x00000000,
@@ -601,5 +602,4 @@ uint32_t gm107_grgpc_code[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x00000000,
 };