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 / gpcgf100.fuc3.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
index 231f696..5f4ddfe 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
@@ -382,56 +382,57 @@ uint32_t gf100_grgpc_code[] = {
        0xb60412fd,
        0x1efd01e4,
        0x0018fe05,
-       0x05b021f5,
+       0x05b421f5,
 /* 0x04eb: main_not_ctx_xfer */
        0x94d30ef4,
        0xf5f010ef,
        0x7e21f501,
        0xc60ef403,
 /* 0x04f8: ih */
-       0x88fe80f9,
-       0xf980f901,
-       0xf9a0f990,
-       0xf9d0f9b0,
-       0xbdf0f9e0,
-       0x00a7f104,
-       0x00a3f002,
-       0xc400aacf,
-       0x0bf404ab,
-       0x1cd7f02c,
-       0x1a00e7f1,
-       0xcf00e3f0,
-       0xf7f100ee,
-       0xf3f01900,
-       0x00ffcf00,
-       0xf00421f4,
-       0x07f101e7,
-       0x03f01d00,
-       0x000ed000,
-/* 0x0546: ih_no_fifo */
-       0x07f104bd,
-       0x03f00100,
-       0x000ad000,
-       0xf0fc04bd,
-       0xd0fce0fc,
-       0xa0fcb0fc,
-       0x80fc90fc,
-       0xfc0088fe,
-       0x0032f480,
-/* 0x056a: hub_barrier_done */
+       0x80f900f9,
+       0xf90188fe,
+       0xf990f980,
+       0xf9b0f9a0,
+       0xf9e0f9d0,
+       0xf104bdf0,
+       0xf00200a7,
+       0xaacf00a3,
+       0x04abc400,
+       0xf02c0bf4,
+       0xe7f11cd7,
+       0xe3f01a00,
+       0x00eecf00,
+       0x1900f7f1,
+       0xcf00f3f0,
+       0x21f400ff,
+       0x01e7f004,
+       0x1d0007f1,
+       0xd00003f0,
+       0x04bd000e,
+/* 0x0548: ih_no_fifo */
+       0x010007f1,
+       0xd00003f0,
+       0x04bd000a,
+       0xe0fcf0fc,
+       0xb0fcd0fc,
+       0x90fca0fc,
+       0x88fe80fc,
+       0xfc80fc00,
+       0x0032f400,
+/* 0x056e: hub_barrier_done */
        0xf7f001f8,
        0x040e9801,
        0xb904febb,
        0xe7f102ff,
        0xe3f09418,
        0x9d21f440,
-/* 0x0582: ctx_redswitch */
+/* 0x0586: ctx_redswitch */
        0xf7f000f8,
        0x0007f120,
        0x0103f085,
        0xbd000fd0,
        0x08e7f004,
-/* 0x0594: ctx_redswitch_delay */
+/* 0x0598: ctx_redswitch_delay */
        0xf401e2b6,
        0xf5f1fd1b,
        0xf5f10800,
@@ -439,13 +440,13 @@ uint32_t gf100_grgpc_code[] = {
        0x03f08500,
        0x000fd001,
        0x00f804bd,
-/* 0x05b0: ctx_xfer */
+/* 0x05b4: ctx_xfer */
        0x810007f1,
        0xd00203f0,
        0x04bd000f,
        0xf50711f4,
-/* 0x05c3: ctx_xfer_not_load */
-       0xf5058221,
+/* 0x05c7: ctx_xfer_not_load */
+       0xf5058621,
        0xbd026a21,
        0xfc07f124,
        0x0203f047,
@@ -475,12 +476,11 @@ uint32_t gf100_grgpc_code[] = {
        0x6f21f508,
        0x5e21f501,
        0x0601f402,
-/* 0x063b: ctx_xfer_post */
+/* 0x063f: ctx_xfer_post */
        0xf50712f4,
-/* 0x063f: ctx_xfer_done */
+/* 0x0643: ctx_xfer_done */
        0xf5027f21,
-       0xf8056a21,
-       0x00000000,
+       0xf8056e21,
        0x00000000,
        0x00000000,
        0x00000000,