Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Ben Skeggs wrote: A couple of regression fixes, some more boards whitelisted for a hw bug workaround, gr/ucode fixes for hangs a user is seeing. The changes look larger than they actually are due to the ucode binaries (*.fucN.h) being regenerated. * 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set drm/nouveau/nvif: allow userspace access to its own client object drm/nouveau/gr/gf100-: fix oops when calling zbc methods drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC drm/nouveau/gr/gf100-: split out per-gpc address calculation macro drm/nouveau/bios: return actual size of the buffer retrieved via _ROM drm/nouveau/instmem: protect instobj list with a spinlock drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop drm/nouveau/pci: enable c800 magic for Clevo P157SM
author: Dave Airlie <airlied@redhat.com> 2015-11-27 15:50:34 -0500
committer: Dave Airlie <airlied@redhat.com> 2015-11-27 15:50:34 -0500
commit: 8c14f72b57570d71afda03c5c51b06f0b4af4367 (patch)
tree: 09a6098c9539a29d2bba40387aaef53acf8fb20b
parent: 2f1371614a5d49428846b90673a89036518dffad (diff)
parent: ef0e9f551899d10834da3d262f20f84db61d64b3 (diff)
16 files changed, 948 insertions, 917 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
index 28bc202f9753..40f845e31272 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
@@ -7,6 +7,7 @@ struct nvkm_instmem {
        const struct nvkm_instmem_func *func;
        struct nvkm_subdev subdev;
+        spinlock_t lock;
        struct list_head list;
        u32 reserved;
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 8b8332e46f24..d5e6938cc6bc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -367,6 +367,7 @@ static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios,
                return -ENODEV;
        }
        obj = (union acpi_object *)buffer.pointer;
+        len = min(len, (int)obj->buffer.length);
        memcpy(bios+offset, obj->buffer.pointer, len);
        kfree(buffer.pointer);
        return len;
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index 3050042e6c6d..a02813e994ec 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -39,6 +39,7 @@
 #include <nvif/client.h>
 #include <nvif/device.h>
+#include <nvif/ioctl.h>
 #include <drmP.h>
@@ -65,9 +66,10 @@ struct nouveau_drm_tile {
 };
 enum nouveau_drm_object_route {
-        NVDRM_OBJECT_NVIF = 0,
+        NVDRM_OBJECT_NVIF = NVIF_IOCTL_V0_OWNER_NVIF,
        NVDRM_OBJECT_USIF,
        NVDRM_OBJECT_ABI16,
+        NVDRM_OBJECT_ANY = NVIF_IOCTL_V0_OWNER_ANY,
 };
 enum nouveau_drm_notify_route {
diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c
index 89dc4ce63490..6ae1b3494bcd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
@@ -313,7 +313,10 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc)
        if (nvif_unpack(argv->v0, 0, 0, true)) {
                /* block access to objects not created via this interface */
                owner = argv->v0.owner;
-                argv->v0.owner = NVDRM_OBJECT_USIF;
+                if (argv->v0.object == 0ULL)
+                        argv->v0.owner = NVDRM_OBJECT_ANY; /* except client */
+                else
+                        argv->v0.owner = NVDRM_OBJECT_USIF;
        } else
                goto done;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index e3c783d0e2ab..caf22b589edc 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -279,6 +279,12 @@ nvkm_device_pci_10de_0fe3[] = {
 };
 static const struct nvkm_device_pci_vendor
+nvkm_device_pci_10de_0fe4[] = {
+        { 0x144d, 0xc740, NULL, { .War00C800_0 = true } },
+        {}
+};
+static const struct nvkm_device_pci_vendor
 nvkm_device_pci_10de_104b[] = {
        { 0x1043, 0x844c, "GeForce GT 625" },
        { 0x1043, 0x846b, "GeForce GT 625" },
@@ -689,6 +695,12 @@ nvkm_device_pci_10de_1199[] = {
 };
 static const struct nvkm_device_pci_vendor
+nvkm_device_pci_10de_11e0[] = {
+        { 0x1558, 0x5106, NULL, { .War00C800_0 = true } },
+        {}
+};
+static const struct nvkm_device_pci_vendor
 nvkm_device_pci_10de_11e3[] = {
        { 0x17aa, 0x3683, "GeForce GTX 760A" },
        {}
@@ -1370,7 +1382,7 @@ nvkm_device_pci_10de[] = {
        { 0x0fe1, "GeForce GT 730M" },
        { 0x0fe2, "GeForce GT 745M" },
        { 0x0fe3, "GeForce GT 745M", nvkm_device_pci_10de_0fe3 },
-        { 0x0fe4, "GeForce GT 750M" },
+        { 0x0fe4, "GeForce GT 750M", nvkm_device_pci_10de_0fe4 },
        { 0x0fe9, "GeForce GT 750M" },
        { 0x0fea, "GeForce GT 755M" },
        { 0x0fec, "GeForce 710A" },
@@ -1485,7 +1497,7 @@ nvkm_device_pci_10de[] = {
        { 0x11c6, "GeForce GTX 650 Ti" },
        { 0x11c8, "GeForce GTX 650" },
        { 0x11cb, "GeForce GT 740" },
-        { 0x11e0, "GeForce GTX 770M" },
+        { 0x11e0, "GeForce GTX 770M", nvkm_device_pci_10de_11e0 },
        { 0x11e1, "GeForce GTX 765M" },
        { 0x11e2, "GeForce GTX 765M" },
        { 0x11e3, "GeForce GTX 760M", nvkm_device_pci_10de_11e3 },
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
index b5b875928aba..74de7a96c22a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
@@ -207,6 +207,8 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
                        const u32 b =  beta * gr->ppc_tpc_nr[gpc][ppc];
                        const u32 t = timeslice_mode;
                        const u32 o = PPC_UNIT(gpc, ppc, 0);
+                        if (!(gr->ppc_mask[gpc] & (1 << ppc)))
+                                continue;
                        mmio_skip(info, o + 0xc0, (t << 28) | (b << 16) | ++bo);
                        mmio_wr32(info, o + 0xc0, (t << 28) | (b << 16) | --bo);
                        bo += grctx->attrib_nr_max * gr->ppc_tpc_nr[gpc][ppc];
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
index 194afe910d21..7dacb3cc0668 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
@@ -52,10 +52,12 @@ mmio_list_base:
 #endif
 #ifdef INCLUDE_CODE
+#define gpc_addr(reg,addr)                                                    /*
+*/      imm32(reg,addr)                                                       /*
+*/      or reg NV_PGRAPH_GPCX_GPCCS_MMIO_CTRL_BASE_ENABLE
 #define gpc_wr32(addr,reg)                                                    /*
+*/      gpc_addr($r14,addr)                                                   /*
 */      mov b32 $r15 reg                                                      /*
-*/      imm32($r14, addr)                                                     /*
-*/      or $r14 NV_PGRAPH_GPCX_GPCCS_MMIO_CTRL_BASE_ENABLE                    /*
 */      call(nv_wr32)
 // reports an exception to the host
@@ -161,7 +163,7 @@ init:
 #if NV_PGRAPH_GPCX_UNK__SIZE > 0
        // figure out which, and how many, UNKs are actually present
-        imm32($r14, 0x500c30)
+        gpc_addr($r14, 0x500c30)
        clear b32 $r2
        clear b32 $r3
        clear b32 $r4
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
index 64d07df4b8b1..bb820ff28621 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
@@ -314,7 +314,7 @@ uint32_t gf117_grgpc_code[] = {
        0x03f01200,
        0x0002d000,
        0x17f104bd,
-        0x10fe0542,
+        0x10fe0545,
        0x0007f100,
        0x0003f007,
        0xbd0000d0,
@@ -338,184 +338,184 @@ uint32_t gf117_grgpc_code[] = {
        0x02d00103,
        0xf104bd00,
        0xf00c30e7,
-        0x24bd50e3,
+        0xe5f050e3,
-        0x44bd34bd,
+        0xbd24bd01,
-/* 0x0430: init_unk_loop */
+/* 0x0433: init_unk_loop */
-        0xb06821f4,
+        0xf444bd34,
-        0x0bf400f6,
+        0xf6b06821,
-        0x01f7f00f,
+        0x0f0bf400,
-        0xfd04f2bb,
+        0xbb01f7f0,
-        0x30b6054f,
+        0x4ffd04f2,
-/* 0x0445: init_unk_next */
+        0x0130b605,
-        0x0120b601,
+/* 0x0448: init_unk_next */
-        0xb004e0b6,
+        0xb60120b6,
-        0x1bf40126,
+        0x26b004e0,
-/* 0x0451: init_unk_done */
+        0xe21bf401,
-        0x070380e2,
+/* 0x0454: init_unk_done */
-        0xf1080480,
+        0x80070380,
-        0xf0010027,
+        0x27f10804,
-        0x22cf0223,
+        0x23f00100,
-        0x9534bd00,
+        0x0022cf02,
-        0x07f10825,
+        0x259534bd,
-        0x03f0c000,
+        0x0007f108,
-        0x0005d001,
+        0x0103f0c0,
-        0x07f104bd,
+        0xbd0005d0,
-        0x03f0c100,
+        0x0007f104,
-        0x0005d001,
+        0x0103f0c1,
-        0x0e9804bd,
+        0xbd0005d0,
-        0x010f9800,
+        0x000e9804,
-        0x015021f5,
+        0xf5010f98,
-        0xbb002fbb,
+        0xbb015021,
-        0x0e98003f,
+        0x3fbb002f,
-        0x020f9801,
+        0x010e9800,
-        0x015021f5,
+        0xf5020f98,
-        0xfd050e98,
+        0x98015021,
-        0x2ebb00ef,
+        0xeffd050e,
-        0x003ebb00,
+        0x002ebb00,
-        0x98020e98,
+        0x98003ebb,
-        0x21f5030f,
+        0x0f98020e,
-        0x0e980150,
+        0x5021f503,
-        0x00effd07,
+        0x070e9801,
-        0xbb002ebb,
+        0xbb00effd,
-        0x35b6003e,
+        0x3ebb002e,
-        0x0007f102,
+        0x0235b600,
-        0x0103f0d3,
+        0xd30007f1,
-        0xbd0003d0,
+        0xd00103f0,
-        0x0825b604,
-        0xb60635b6,
-        0x30b60120,
-        0x0824b601,
-        0xb90834b6,
-        0x21f5022f,
-        0x2fbb02d3,
-        0x003fbb00,
-        0x010007f1,
-        0xd00203f0,
        0x04bd0003,
-        0x29f024bd,
+        0xb60825b6,
-        0x0007f11f,
+        0x20b60635,
-        0x0203f008,
+        0x0130b601,
-        0xbd0002d0,
+        0xb60824b6,
-/* 0x0505: main */
+        0x2fb90834,
-        0x0031f404,
+        0xd321f502,
-        0xf00028f4,
+        0x002fbb02,
-        0x21f424d7,
+        0xf1003fbb,
-        0xf401f439,
+        0xf0010007,
-        0xf404e4b0,
+        0x03d00203,
-        0x81fe1e18,
+        0xbd04bd00,
-        0x0627f001,
+        0x1f29f024,
-        0x12fd20bd,
+        0x080007f1,
-        0x01e4b604,
+        0xd00203f0,
-        0xfe051efd,
+        0x04bd0002,
-        0x21f50018,
+/* 0x0508: main */
-        0x0ef405fa,
+        0xf40031f4,
-/* 0x0535: main_not_ctx_xfer */
+        0xd7f00028,
-        0x10ef94d3,
+        0x3921f424,
-        0xf501f5f0,
+        0xb0f401f4,
-        0xf4037e21,
+        0x18f404e4,
-/* 0x0542: ih */
+        0x0181fe1e,
-        0x80f9c60e,
+        0xbd0627f0,
-        0xf90188fe,
+        0x0412fd20,
-        0xf990f980,
+        0xfd01e4b6,
-        0xf9b0f9a0,
+        0x18fe051e,
-        0xf9e0f9d0,
+        0xfd21f500,
-        0xf104bdf0,
+        0xd30ef405,
-        0xf00200a7,
+/* 0x0538: main_not_ctx_xfer */
-        0xaacf00a3,
+        0xf010ef94,
-        0x04abc400,
+        0x21f501f5,
-        0xf02c0bf4,
+        0x0ef4037e,
-        0xe7f124d7,
+/* 0x0545: ih */
-        0xe3f01a00,
+        0xfe80f9c6,
-        0x00eecf00,
+        0x80f90188,
-        0x1900f7f1,
+        0xa0f990f9,
-        0xcf00f3f0,
+        0xd0f9b0f9,
-        0x21f400ff,
+        0xf0f9e0f9,
-        0x01e7f004,
+        0xa7f104bd,
-        0x1d0007f1,
+        0xa3f00200,
-        0xd00003f0,
+        0x00aacf00,
-        0x04bd000e,
+        0xf404abc4,
-/* 0x0590: ih_no_fifo */
+        0xd7f02c0b,
-        0x010007f1,
+        0x00e7f124,
-        0xd00003f0,
+        0x00e3f01a,
-        0x04bd000a,
+        0xf100eecf,
-        0xe0fcf0fc,
+        0xf01900f7,
-        0xb0fcd0fc,
+        0xffcf00f3,
-        0x90fca0fc,
+        0x0421f400,
-        0x88fe80fc,
+        0xf101e7f0,
-        0xf480fc00,
+        0xf01d0007,
-        0x01f80032,
+        0x0ed00003,
-/* 0x05b4: hub_barrier_done */
+/* 0x0593: ih_no_fifo */
-        0x9801f7f0,
+        0xf104bd00,
-        0xfebb040e,
+        0xf0010007,
-        0x02ffb904,
+        0x0ad00003,
-        0x9418e7f1,
+        0xfc04bd00,
-        0xf440e3f0,
+        0xfce0fcf0,
-        0x00f89d21,
+        0xfcb0fcd0,
-/* 0x05cc: ctx_redswitch */
+        0xfc90fca0,
-        0xf120f7f0,
+        0x0088fe80,
+        0x32f480fc,
+/* 0x05b7: hub_barrier_done */
+        0xf001f800,
+        0x0e9801f7,
+        0x04febb04,
+        0xf102ffb9,
+        0xf09418e7,
+        0x21f440e3,
+/* 0x05cf: ctx_redswitch */
+        0xf000f89d,
+        0x07f120f7,
+        0x03f08500,
+        0x000fd001,
+        0xe7f004bd,
+/* 0x05e1: ctx_redswitch_delay */
+        0x01e2b608,
+        0xf1fd1bf4,
+        0xf10800f5,
+        0xf10200f5,
        0xf0850007,
        0x0fd00103,
-        0xf004bd00,
+        0xf804bd00,
-/* 0x05de: ctx_redswitch_delay */
+/* 0x05fd: ctx_xfer */
-        0xe2b608e7,
+        0x0007f100,
-        0xfd1bf401,
+        0x0203f081,
-        0x0800f5f1,
+        0xbd000fd0,
-        0x0200f5f1,
+        0x0711f404,
-        0x850007f1,
+        0x05cf21f5,
-        0xd00103f0,
+/* 0x0610: ctx_xfer_not_load */
-        0x04bd000f,
+        0x026a21f5,
-/* 0x05fa: ctx_xfer */
+        0x07f124bd,
-        0x07f100f8,
+        0x03f047fc,
-        0x03f08100,
+        0x0002d002,
-        0x000fd002,
+        0x2cf004bd,
-        0x11f404bd,
+        0x0320b601,
-        0xcc21f507,
+        0x4afc07f1,
-/* 0x060d: ctx_xfer_not_load */
+        0xd00203f0,
-        0x6a21f505,
+        0x04bd0002,
-        0xf124bd02,
-        0xf047fc07,
-        0x02d00203,
-        0xf004bd00,
-        0x20b6012c,
-        0xfc07f103,
-        0x0203f04a,
-        0xbd0002d0,
-        0x01acf004,
-        0xf102a5f0,
-        0xf00000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98000c,
-        0x00e7f001,
-        0x016f21f5,
-        0xf101acf0,
-        0xf04000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98010c,
-        0x060f9802,
-        0x0800e7f1,
-        0x016f21f5,
        0xf001acf0,
-        0xb7f104a5,
+        0xb7f102a5,
-        0xb3f03000,
+        0xb3f00000,
        0x040c9850,
        0xbb0fc4b6,
        0x0c9800bc,
-        0x030d9802,
+        0x010d9800,
-        0xf1080f98,
+        0xf500e7f0,
-        0xf50200e7,
+        0xf0016f21,
-        0xf5016f21,
+        0xb7f101ac,
-        0xf4025e21,
+        0xb3f04000,
-        0x12f40601,
+        0x040c9850,
-/* 0x06a9: ctx_xfer_post */
+        0xbb0fc4b6,
-        0x7f21f507,
+        0x0c9800bc,
-/* 0x06ad: ctx_xfer_done */
+        0x020d9801,
-        0xb421f502,
+        0xf1060f98,
-        0x0000f805,
+        0xf50800e7,
-        0x00000000,
+        0xf0016f21,
+        0xa5f001ac,
+        0x00b7f104,
+        0x50b3f030,
+        0xb6040c98,
+        0xbcbb0fc4,
+        0x020c9800,
+        0x98030d98,
+        0xe7f1080f,
+        0x21f50200,
+        0x21f5016f,
+        0x01f4025e,
+        0x0712f406,
+/* 0x06ac: ctx_xfer_post */
+        0x027f21f5,
+/* 0x06b0: ctx_xfer_done */
+        0x05b721f5,
+        0x000000f8,
        0x00000000,
        0x00000000,
        0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
index 2f596433c222..911976d20940 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
@@ -314,7 +314,7 @@ uint32_t gk104_grgpc_code[] = {
        0x03f01200,
        0x0002d000,
        0x17f104bd,
-        0x10fe0542,
+        0x10fe0545,
        0x0007f100,
        0x0003f007,
        0xbd0000d0,
@@ -338,184 +338,184 @@ uint32_t gk104_grgpc_code[] = {
        0x02d00103,
        0xf104bd00,
        0xf00c30e7,
-        0x24bd50e3,
+        0xe5f050e3,
-        0x44bd34bd,
+        0xbd24bd01,
-/* 0x0430: init_unk_loop */
+/* 0x0433: init_unk_loop */
-        0xb06821f4,
+        0xf444bd34,
-        0x0bf400f6,
+        0xf6b06821,
-        0x01f7f00f,
+        0x0f0bf400,
-        0xfd04f2bb,
+        0xbb01f7f0,
-        0x30b6054f,
+        0x4ffd04f2,
-/* 0x0445: init_unk_next */
+        0x0130b605,
-        0x0120b601,
+/* 0x0448: init_unk_next */
-        0xb004e0b6,
+        0xb60120b6,
-        0x1bf40126,
+        0x26b004e0,
-/* 0x0451: init_unk_done */
+        0xe21bf401,
-        0x070380e2,
+/* 0x0454: init_unk_done */
-        0xf1080480,
+        0x80070380,
-        0xf0010027,
+        0x27f10804,
-        0x22cf0223,
+        0x23f00100,
-        0x9534bd00,
+        0x0022cf02,
-        0x07f10825,
+        0x259534bd,
-        0x03f0c000,
+        0x0007f108,
-        0x0005d001,
+        0x0103f0c0,
-        0x07f104bd,
+        0xbd0005d0,
-        0x03f0c100,
+        0x0007f104,
-        0x0005d001,
+        0x0103f0c1,
-        0x0e9804bd,
+        0xbd0005d0,
-        0x010f9800,
+        0x000e9804,
-        0x015021f5,
+        0xf5010f98,
-        0xbb002fbb,
+        0xbb015021,
-        0x0e98003f,
+        0x3fbb002f,
-        0x020f9801,
+        0x010e9800,
-        0x015021f5,
+        0xf5020f98,
-        0xfd050e98,
+        0x98015021,
-        0x2ebb00ef,
+        0xeffd050e,
-        0x003ebb00,
+        0x002ebb00,
-        0x98020e98,
+        0x98003ebb,
-        0x21f5030f,
+        0x0f98020e,
-        0x0e980150,
+        0x5021f503,
-        0x00effd07,
+        0x070e9801,
-        0xbb002ebb,
+        0xbb00effd,
-        0x35b6003e,
+        0x3ebb002e,
-        0x0007f102,
+        0x0235b600,
-        0x0103f0d3,
+        0xd30007f1,
-        0xbd0003d0,
+        0xd00103f0,
-        0x0825b604,
-        0xb60635b6,
-        0x30b60120,
-        0x0824b601,
-        0xb90834b6,
-        0x21f5022f,
-        0x2fbb02d3,
-        0x003fbb00,
-        0x010007f1,
-        0xd00203f0,
        0x04bd0003,
-        0x29f024bd,
+        0xb60825b6,
-        0x0007f11f,
+        0x20b60635,
-        0x0203f008,
+        0x0130b601,
-        0xbd0002d0,
+        0xb60824b6,
-/* 0x0505: main */
+        0x2fb90834,
-        0x0031f404,
+        0xd321f502,
-        0xf00028f4,
+        0x002fbb02,
-        0x21f424d7,
+        0xf1003fbb,
-        0xf401f439,
+        0xf0010007,
-        0xf404e4b0,
+        0x03d00203,
-        0x81fe1e18,
+        0xbd04bd00,
-        0x0627f001,
+        0x1f29f024,
-        0x12fd20bd,
+        0x080007f1,
-        0x01e4b604,
+        0xd00203f0,
-        0xfe051efd,
+        0x04bd0002,
-        0x21f50018,
+/* 0x0508: main */
-        0x0ef405fa,
+        0xf40031f4,
-/* 0x0535: main_not_ctx_xfer */
+        0xd7f00028,
-        0x10ef94d3,
+        0x3921f424,
-        0xf501f5f0,
+        0xb0f401f4,
-        0xf4037e21,
+        0x18f404e4,
-/* 0x0542: ih */
+        0x0181fe1e,
-        0x80f9c60e,
+        0xbd0627f0,
-        0xf90188fe,
+        0x0412fd20,
-        0xf990f980,
+        0xfd01e4b6,
-        0xf9b0f9a0,
+        0x18fe051e,
-        0xf9e0f9d0,
+        0xfd21f500,
-        0xf104bdf0,
+        0xd30ef405,
-        0xf00200a7,
+/* 0x0538: main_not_ctx_xfer */
-        0xaacf00a3,
+        0xf010ef94,
-        0x04abc400,
+        0x21f501f5,
-        0xf02c0bf4,
+        0x0ef4037e,
-        0xe7f124d7,
+/* 0x0545: ih */
-        0xe3f01a00,
+        0xfe80f9c6,
-        0x00eecf00,
+        0x80f90188,
-        0x1900f7f1,
+        0xa0f990f9,
-        0xcf00f3f0,
+        0xd0f9b0f9,
-        0x21f400ff,
+        0xf0f9e0f9,
-        0x01e7f004,
+        0xa7f104bd,
-        0x1d0007f1,
+        0xa3f00200,
-        0xd00003f0,
+        0x00aacf00,
-        0x04bd000e,
+        0xf404abc4,
-/* 0x0590: ih_no_fifo */
+        0xd7f02c0b,
-        0x010007f1,
+        0x00e7f124,
-        0xd00003f0,
+        0x00e3f01a,
-        0x04bd000a,
+        0xf100eecf,
-        0xe0fcf0fc,
+        0xf01900f7,
-        0xb0fcd0fc,
+        0xffcf00f3,
-        0x90fca0fc,
+        0x0421f400,
-        0x88fe80fc,
+        0xf101e7f0,
-        0xf480fc00,
+        0xf01d0007,
-        0x01f80032,
+        0x0ed00003,
-/* 0x05b4: hub_barrier_done */
+/* 0x0593: ih_no_fifo */
-        0x9801f7f0,
+        0xf104bd00,
-        0xfebb040e,
+        0xf0010007,
-        0x02ffb904,
+        0x0ad00003,
-        0x9418e7f1,
+        0xfc04bd00,
-        0xf440e3f0,
+        0xfce0fcf0,
-        0x00f89d21,
+        0xfcb0fcd0,
-/* 0x05cc: ctx_redswitch */
+        0xfc90fca0,
-        0xf120f7f0,
+        0x0088fe80,
+        0x32f480fc,
+/* 0x05b7: hub_barrier_done */
+        0xf001f800,
+        0x0e9801f7,
+        0x04febb04,
+        0xf102ffb9,
+        0xf09418e7,
+        0x21f440e3,
+/* 0x05cf: ctx_redswitch */
+        0xf000f89d,
+        0x07f120f7,
+        0x03f08500,
+        0x000fd001,
+        0xe7f004bd,
+/* 0x05e1: ctx_redswitch_delay */
+        0x01e2b608,
+        0xf1fd1bf4,
+        0xf10800f5,
+        0xf10200f5,
        0xf0850007,
        0x0fd00103,
-        0xf004bd00,
+        0xf804bd00,
-/* 0x05de: ctx_redswitch_delay */
+/* 0x05fd: ctx_xfer */
-        0xe2b608e7,
+        0x0007f100,
-        0xfd1bf401,
+        0x0203f081,
-        0x0800f5f1,
+        0xbd000fd0,
-        0x0200f5f1,
+        0x0711f404,
-        0x850007f1,
+        0x05cf21f5,
-        0xd00103f0,
+/* 0x0610: ctx_xfer_not_load */
-        0x04bd000f,
+        0x026a21f5,
-/* 0x05fa: ctx_xfer */
+        0x07f124bd,
-        0x07f100f8,
+        0x03f047fc,
-        0x03f08100,
+        0x0002d002,
-        0x000fd002,
+        0x2cf004bd,
-        0x11f404bd,
+        0x0320b601,
-        0xcc21f507,
+        0x4afc07f1,
-/* 0x060d: ctx_xfer_not_load */
+        0xd00203f0,
-        0x6a21f505,
+        0x04bd0002,
-        0xf124bd02,
-        0xf047fc07,
-        0x02d00203,
-        0xf004bd00,
-        0x20b6012c,
-        0xfc07f103,
-        0x0203f04a,
-        0xbd0002d0,
-        0x01acf004,
-        0xf102a5f0,
-        0xf00000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98000c,
-        0x00e7f001,
-        0x016f21f5,
-        0xf101acf0,
-        0xf04000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98010c,
-        0x060f9802,
-        0x0800e7f1,
-        0x016f21f5,
        0xf001acf0,
-        0xb7f104a5,
+        0xb7f102a5,
-        0xb3f03000,
+        0xb3f00000,
        0x040c9850,
        0xbb0fc4b6,
        0x0c9800bc,
-        0x030d9802,
+        0x010d9800,
-        0xf1080f98,
+        0xf500e7f0,
-        0xf50200e7,
+        0xf0016f21,
-        0xf5016f21,
+        0xb7f101ac,
-        0xf4025e21,
+        0xb3f04000,
-        0x12f40601,
+        0x040c9850,
-/* 0x06a9: ctx_xfer_post */
+        0xbb0fc4b6,
-        0x7f21f507,
+        0x0c9800bc,
-/* 0x06ad: ctx_xfer_done */
+        0x020d9801,
-        0xb421f502,
+        0xf1060f98,
-        0x0000f805,
+        0xf50800e7,
-        0x00000000,
+        0xf0016f21,
+        0xa5f001ac,
+        0x00b7f104,
+        0x50b3f030,
+        0xb6040c98,
+        0xbcbb0fc4,
+        0x020c9800,
+        0x98030d98,
+        0xe7f1080f,
+        0x21f50200,
+        0x21f5016f,
+        0x01f4025e,
+        0x0712f406,
+/* 0x06ac: ctx_xfer_post */
+        0x027f21f5,
+/* 0x06b0: ctx_xfer_done */
+        0x05b721f5,
+        0x000000f8,
        0x00000000,
        0x00000000,
        0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
index ee8e54db8fc9..1c6e11b05df2 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
@@ -314,7 +314,7 @@ uint32_t gk110_grgpc_code[] = {
        0x03f01200,
        0x0002d000,
        0x17f104bd,
-        0x10fe0542,
+        0x10fe0545,
        0x0007f100,
        0x0003f007,
        0xbd0000d0,
@@ -338,184 +338,184 @@ uint32_t gk110_grgpc_code[] = {
        0x02d00103,
        0xf104bd00,
        0xf00c30e7,
-        0x24bd50e3,
+        0xe5f050e3,
-        0x44bd34bd,
+        0xbd24bd01,
-/* 0x0430: init_unk_loop */
+/* 0x0433: init_unk_loop */
-        0xb06821f4,
+        0xf444bd34,
-        0x0bf400f6,
+        0xf6b06821,
-        0x01f7f00f,
+        0x0f0bf400,
-        0xfd04f2bb,
+        0xbb01f7f0,
-        0x30b6054f,
+        0x4ffd04f2,
-/* 0x0445: init_unk_next */
+        0x0130b605,
-        0x0120b601,
+/* 0x0448: init_unk_next */
-        0xb004e0b6,
+        0xb60120b6,
-        0x1bf40226,
+        0x26b004e0,
-/* 0x0451: init_unk_done */
+        0xe21bf402,
-        0x070380e2,
+/* 0x0454: init_unk_done */
-        0xf1080480,
+        0x80070380,
-        0xf0010027,
+        0x27f10804,
-        0x22cf0223,
+        0x23f00100,
-        0x9534bd00,
+        0x0022cf02,
-        0x07f10825,
+        0x259534bd,
-        0x03f0c000,
+        0x0007f108,
-        0x0005d001,
+        0x0103f0c0,
-        0x07f104bd,
+        0xbd0005d0,
-        0x03f0c100,
+        0x0007f104,
-        0x0005d001,
+        0x0103f0c1,
-        0x0e9804bd,
+        0xbd0005d0,
-        0x010f9800,
+        0x000e9804,
-        0x015021f5,
+        0xf5010f98,
-        0xbb002fbb,
+        0xbb015021,
-        0x0e98003f,
+        0x3fbb002f,
-        0x020f9801,
+        0x010e9800,
-        0x015021f5,
+        0xf5020f98,
-        0xfd050e98,
+        0x98015021,
-        0x2ebb00ef,
+        0xeffd050e,
-        0x003ebb00,
+        0x002ebb00,
-        0x98020e98,
+        0x98003ebb,
-        0x21f5030f,
+        0x0f98020e,
-        0x0e980150,
+        0x5021f503,
-        0x00effd07,
+        0x070e9801,
-        0xbb002ebb,
+        0xbb00effd,
-        0x35b6003e,
+        0x3ebb002e,
-        0x0007f102,
+        0x0235b600,
-        0x0103f0d3,
+        0xd30007f1,
-        0xbd0003d0,
+        0xd00103f0,
-        0x0825b604,
-        0xb60635b6,
-        0x30b60120,
-        0x0824b601,
-        0xb90834b6,
-        0x21f5022f,
-        0x2fbb02d3,
-        0x003fbb00,
-        0x010007f1,
-        0xd00203f0,
        0x04bd0003,
-        0x29f024bd,
+        0xb60825b6,
-        0x0007f11f,
+        0x20b60635,
-        0x0203f030,
+        0x0130b601,
-        0xbd0002d0,
+        0xb60824b6,
-/* 0x0505: main */
+        0x2fb90834,
-        0x0031f404,
+        0xd321f502,
-        0xf00028f4,
+        0x002fbb02,
-        0x21f424d7,
+        0xf1003fbb,
-        0xf401f439,
+        0xf0010007,
-        0xf404e4b0,
+        0x03d00203,
-        0x81fe1e18,
+        0xbd04bd00,
-        0x0627f001,
+        0x1f29f024,
-        0x12fd20bd,
+        0x300007f1,
-        0x01e4b604,
+        0xd00203f0,
-        0xfe051efd,
+        0x04bd0002,
-        0x21f50018,
+/* 0x0508: main */
-        0x0ef405fa,
+        0xf40031f4,
-/* 0x0535: main_not_ctx_xfer */
+        0xd7f00028,
-        0x10ef94d3,
+        0x3921f424,
-        0xf501f5f0,
+        0xb0f401f4,
-        0xf4037e21,
+        0x18f404e4,
-/* 0x0542: ih */
+        0x0181fe1e,
-        0x80f9c60e,
+        0xbd0627f0,
-        0xf90188fe,
+        0x0412fd20,
-        0xf990f980,
+        0xfd01e4b6,
-        0xf9b0f9a0,
+        0x18fe051e,
-        0xf9e0f9d0,
+        0xfd21f500,
-        0xf104bdf0,
+        0xd30ef405,
-        0xf00200a7,
+/* 0x0538: main_not_ctx_xfer */
-        0xaacf00a3,
+        0xf010ef94,
-        0x04abc400,
+        0x21f501f5,
-        0xf02c0bf4,
+        0x0ef4037e,
-        0xe7f124d7,
+/* 0x0545: ih */
-        0xe3f01a00,
+        0xfe80f9c6,
-        0x00eecf00,
+        0x80f90188,
-        0x1900f7f1,
+        0xa0f990f9,
-        0xcf00f3f0,
+        0xd0f9b0f9,
-        0x21f400ff,
+        0xf0f9e0f9,
-        0x01e7f004,
+        0xa7f104bd,
-        0x1d0007f1,
+        0xa3f00200,
-        0xd00003f0,
+        0x00aacf00,
-        0x04bd000e,
+        0xf404abc4,
-/* 0x0590: ih_no_fifo */
+        0xd7f02c0b,
-        0x010007f1,
+        0x00e7f124,
-        0xd00003f0,
+        0x00e3f01a,
-        0x04bd000a,
+        0xf100eecf,
-        0xe0fcf0fc,
+        0xf01900f7,
-        0xb0fcd0fc,
+        0xffcf00f3,
-        0x90fca0fc,
+        0x0421f400,
-        0x88fe80fc,
+        0xf101e7f0,
-        0xf480fc00,
+        0xf01d0007,
-        0x01f80032,
+        0x0ed00003,
-/* 0x05b4: hub_barrier_done */
+/* 0x0593: ih_no_fifo */
-        0x9801f7f0,
+        0xf104bd00,
-        0xfebb040e,
+        0xf0010007,
-        0x02ffb904,
+        0x0ad00003,
-        0x9418e7f1,
+        0xfc04bd00,
-        0xf440e3f0,
+        0xfce0fcf0,
-        0x00f89d21,
+        0xfcb0fcd0,
-/* 0x05cc: ctx_redswitch */
+        0xfc90fca0,
-        0xf120f7f0,
+        0x0088fe80,
+        0x32f480fc,
+/* 0x05b7: hub_barrier_done */
+        0xf001f800,
+        0x0e9801f7,
+        0x04febb04,
+        0xf102ffb9,
+        0xf09418e7,
+        0x21f440e3,
+/* 0x05cf: ctx_redswitch */
+        0xf000f89d,
+        0x07f120f7,
+        0x03f08500,
+        0x000fd001,
+        0xe7f004bd,
+/* 0x05e1: ctx_redswitch_delay */
+        0x01e2b608,
+        0xf1fd1bf4,
+        0xf10800f5,
+        0xf10200f5,
        0xf0850007,
        0x0fd00103,
-        0xf004bd00,
+        0xf804bd00,
-/* 0x05de: ctx_redswitch_delay */
+/* 0x05fd: ctx_xfer */
-        0xe2b608e7,
+        0x0007f100,
-        0xfd1bf401,
+        0x0203f081,
-        0x0800f5f1,
+        0xbd000fd0,
-        0x0200f5f1,
+        0x0711f404,
-        0x850007f1,
+        0x05cf21f5,
-        0xd00103f0,
+/* 0x0610: ctx_xfer_not_load */
-        0x04bd000f,
+        0x026a21f5,
-/* 0x05fa: ctx_xfer */
+        0x07f124bd,
-        0x07f100f8,
+        0x03f047fc,
-        0x03f08100,
+        0x0002d002,
-        0x000fd002,
+        0x2cf004bd,
-        0x11f404bd,
+        0x0320b601,
-        0xcc21f507,
+        0x4afc07f1,
-/* 0x060d: ctx_xfer_not_load */
+        0xd00203f0,
-        0x6a21f505,
+        0x04bd0002,
-        0xf124bd02,
-        0xf047fc07,
-        0x02d00203,
-        0xf004bd00,
-        0x20b6012c,
-        0xfc07f103,
-        0x0203f04a,
-        0xbd0002d0,
-        0x01acf004,
-        0xf102a5f0,
-        0xf00000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98000c,
-        0x00e7f001,
-        0x016f21f5,
-        0xf101acf0,
-        0xf04000b7,
-        0x0c9850b3,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98010c,
-        0x060f9802,
-        0x0800e7f1,
-        0x016f21f5,
        0xf001acf0,
-        0xb7f104a5,
+        0xb7f102a5,
-        0xb3f03000,
+        0xb3f00000,
        0x040c9850,
        0xbb0fc4b6,
        0x0c9800bc,
-        0x030d9802,
+        0x010d9800,
-        0xf1080f98,
+        0xf500e7f0,
-        0xf50200e7,
+        0xf0016f21,
-        0xf5016f21,
+        0xb7f101ac,
-        0xf4025e21,
+        0xb3f04000,
-        0x12f40601,
+        0x040c9850,
-/* 0x06a9: ctx_xfer_post */
+        0xbb0fc4b6,
-        0x7f21f507,
+        0x0c9800bc,
-/* 0x06ad: ctx_xfer_done */
+        0x020d9801,
-        0xb421f502,
+        0xf1060f98,
-        0x0000f805,
+        0xf50800e7,
-        0x00000000,
+        0xf0016f21,
+        0xa5f001ac,
+        0x00b7f104,
+        0x50b3f030,
+        0xb6040c98,
+        0xbcbb0fc4,
+        0x020c9800,
+        0x98030d98,
+        0xe7f1080f,
+        0x21f50200,
+        0x21f5016f,
+        0x01f4025e,
+        0x0712f406,
+/* 0x06ac: ctx_xfer_post */
+        0x027f21f5,
+/* 0x06b0: ctx_xfer_done */
+        0x05b721f5,
+        0x000000f8,
        0x00000000,
        0x00000000,
        0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
index fbcc342f896f..84af7ec6a78e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
@@ -276,7 +276,7 @@ uint32_t gk208_grgpc_code[] = {
        0x02020014,
        0xf6120040,
        0x04bd0002,
-        0xfe048141,
+        0xfe048441,
        0x00400010,
        0x0000f607,
        0x040204bd,
@@ -295,165 +295,165 @@ uint32_t gk208_grgpc_code[] = {
        0x01c90080,
        0xbd0002f6,
        0x0c308e04,
-        0xbd24bd50,
+        0x01e5f050,
-/* 0x0383: init_unk_loop */
+        0x34bd24bd,
-        0x7e44bd34,
+/* 0x0386: init_unk_loop */
-        0xb0000065,
+        0x657e44bd,
-        0x0bf400f6,
+        0xf6b00000,
-        0xbb010f0e,
+        0x0e0bf400,
-        0x4ffd04f2,
+        0xf2bb010f,
-        0x0130b605,
+        0x054ffd04,
-/* 0x0398: init_unk_next */
+/* 0x039b: init_unk_next */
-        0xb60120b6,
+        0xb60130b6,
-        0x26b004e0,
+        0xe0b60120,
-        0xe21bf401,
+        0x0126b004,
-/* 0x03a4: init_unk_done */
+/* 0x03a7: init_unk_done */
-        0xb50703b5,
+        0xb5e21bf4,
-        0x00820804,
+        0x04b50703,
-        0x22cf0201,
+        0x01008208,
-        0x9534bd00,
+        0x0022cf02,
-        0x00800825,
+        0x259534bd,
-        0x05f601c0,
+        0xc0008008,
-        0x8004bd00,
+        0x0005f601,
-        0xf601c100,
+        0x008004bd,
-        0x04bd0005,
+        0x05f601c1,
-        0x98000e98,
+        0x9804bd00,
-        0x207e010f,
+        0x0f98000e,
-        0x2fbb0001,
+        0x01207e01,
-        0x003fbb00,
+        0x002fbb00,
-        0x98010e98,
+        0x98003fbb,
-        0x207e020f,
+        0x0f98010e,
-        0x0e980001,
+        0x01207e02,
-        0x00effd05,
+        0x050e9800,
-        0xbb002ebb,
+        0xbb00effd,
-        0x0e98003e,
+        0x3ebb002e,
-        0x030f9802,
+        0x020e9800,
-        0x0001207e,
+        0x7e030f98,
-        0xfd070e98,
+        0x98000120,
-        0x2ebb00ef,
+        0xeffd070e,
-        0x003ebb00,
+        0x002ebb00,
-        0x800235b6,
+        0xb6003ebb,
-        0xf601d300,
+        0x00800235,
-        0x04bd0003,
+        0x03f601d3,
-        0xb60825b6,
+        0xb604bd00,
-        0x20b60635,
+        0x35b60825,
-        0x0130b601,
+        0x0120b606,
-        0xb60824b6,
+        0xb60130b6,
-        0x2fb20834,
+        0x34b60824,
-        0x0002687e,
+        0x7e2fb208,
-        0xbb002fbb,
+        0xbb000268,
-        0x0080003f,
+        0x3fbb002f,
-        0x03f60201,
+        0x01008000,
-        0xbd04bd00,
+        0x0003f602,
-        0x1f29f024,
+        0x24bd04bd,
-        0x02300080,
+        0x801f29f0,
-        0xbd0002f6,
+        0xf6023000,
-/* 0x0445: main */
+        0x04bd0002,
-        0x0031f404,
+/* 0x0448: main */
-        0x0d0028f4,
+        0xf40031f4,
-        0x00377e24,
+        0x240d0028,
-        0xf401f400,
+        0x0000377e,
-        0xf404e4b0,
+        0xb0f401f4,
-        0x81fe1d18,
+        0x18f404e4,
-        0xbd060201,
+        0x0181fe1d,
-        0x0412fd20,
+        0x20bd0602,
-        0xfd01e4b6,
+        0xb60412fd,
-        0x18fe051e,
+        0x1efd01e4,
-        0x05187e00,
+        0x0018fe05,
-        0xd40ef400,
+        0x00051b7e,
-/* 0x0474: main_not_ctx_xfer */
+/* 0x0477: main_not_ctx_xfer */
-        0xf010ef94,
+        0x94d40ef4,
-        0xf87e01f5,
+        0xf5f010ef,
-        0x0ef40002,
+        0x02f87e01,
-/* 0x0481: ih */
+        0xc70ef400,
-        0xfe80f9c7,
+/* 0x0484: ih */
-        0x80f90188,
+        0x88fe80f9,
-        0xa0f990f9,
+        0xf980f901,
-        0xd0f9b0f9,
+        0xf9a0f990,
-        0xf0f9e0f9,
+        0xf9d0f9b0,
-        0x004a04bd,
+        0xbdf0f9e0,
-        0x00aacf02,
+        0x02004a04,
-        0xf404abc4,
+        0xc400aacf,
-        0x240d1f0b,
+        0x0bf404ab,
-        0xcf1a004e,
+        0x4e240d1f,
-        0x004f00ee,
+        0xeecf1a00,
-        0x00ffcf19,
+        0x19004f00,
-        0x0000047e,
+        0x7e00ffcf,
-        0x0040010e,
+        0x0e000004,
-        0x000ef61d,
+        0x1d004001,
-/* 0x04be: ih_no_fifo */
+        0xbd000ef6,
-        0x004004bd,
+/* 0x04c1: ih_no_fifo */
-        0x000af601,
+        0x01004004,
-        0xf0fc04bd,
+        0xbd000af6,
-        0xd0fce0fc,
+        0xfcf0fc04,
-        0xa0fcb0fc,
+        0xfcd0fce0,
-        0x80fc90fc,
+        0xfca0fcb0,
-        0xfc0088fe,
+        0xfe80fc90,
-        0x0032f480,
+        0x80fc0088,
-/* 0x04de: hub_barrier_done */
+        0xf80032f4,
-        0x010f01f8,
+/* 0x04e1: hub_barrier_done */
-        0xbb040e98,
+        0x98010f01,
-        0xffb204fe,
+        0xfebb040e,
-        0x4094188e,
+        0x8effb204,
-        0x00008f7e,
+        0x7e409418,
-/* 0x04f2: ctx_redswitch */
+        0xf800008f,
-        0x200f00f8,
+/* 0x04f5: ctx_redswitch */
+        0x80200f00,
+        0xf6018500,
+        0x04bd000f,
+/* 0x0502: ctx_redswitch_delay */
+        0xe2b6080e,
+        0xfd1bf401,
+        0x0800f5f1,
+        0x0200f5f1,
        0x01850080,
        0xbd000ff6,
-/* 0x04ff: ctx_redswitch_delay */
+/* 0x051b: ctx_xfer */
-        0xb6080e04,
+        0x8000f804,
-        0x1bf401e2,
+        0xf6028100,
-        0x00f5f1fd,
+        0x04bd000f,
-        0x00f5f108,
+        0x7e0711f4,
-        0x85008002,
+/* 0x052b: ctx_xfer_not_load */
-        0x000ff601,
+        0x7e0004f5,
-        0x00f804bd,
+        0xbd000216,
-/* 0x0518: ctx_xfer */
+        0x47fc8024,
-        0x02810080,
-        0xbd000ff6,
-        0x0711f404,
-        0x0004f27e,
-/* 0x0528: ctx_xfer_not_load */
-        0x0002167e,
-        0xfc8024bd,
-        0x02f60247,
-        0xf004bd00,
-        0x20b6012c,
-        0x4afc8003,
        0x0002f602,
-        0xacf004bd,
+        0x2cf004bd,
-        0x02a5f001,
+        0x0320b601,
-        0x5000008b,
+        0x024afc80,
-        0xb6040c98,
+        0xbd0002f6,
-        0xbcbb0fc4,
+        0x01acf004,
-        0x000c9800,
+        0x8b02a5f0,
-        0x0e010d98,
+        0x98500000,
-        0x013d7e00,
-        0x01acf000,
-        0x5040008b,
-        0xb6040c98,
-        0xbcbb0fc4,
-        0x010c9800,
-        0x98020d98,
-        0x004e060f,
-        0x013d7e08,
-        0x01acf000,
-        0x8b04a5f0,
-        0x98503000,
        0xc4b6040c,
        0x00bcbb0f,
-        0x98020c98,
+        0x98000c98,
-        0x0f98030d,
+        0x000e010d,
-        0x02004e08,
        0x00013d7e,
-        0x00020a7e,
+        0x8b01acf0,
-        0xf40601f4,
+        0x98504000,
-/* 0x05b2: ctx_xfer_post */
+        0xc4b6040c,
-        0x277e0712,
+        0x00bcbb0f,
-/* 0x05b6: ctx_xfer_done */
+        0x98010c98,
-        0xde7e0002,
+        0x0f98020d,
-        0x00f80004,
+        0x08004e06,
-        0x00000000,
+        0x00013d7e,
+        0xf001acf0,
+        0x008b04a5,
+        0x0c985030,
+        0x0fc4b604,
+        0x9800bcbb,
+        0x0d98020c,
+        0x080f9803,
+        0x7e02004e,
+        0x7e00013d,
+        0xf400020a,
+        0x12f40601,
+/* 0x05b5: ctx_xfer_post */
+        0x02277e07,
+/* 0x05b9: ctx_xfer_done */
+        0x04e17e00,
+        0x0000f800,
        0x00000000,
        0x00000000,
        0x00000000,
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 51f5c3c6e966..11bf363a6ae9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
@@ -289,7 +289,7 @@ uint32_t gm107_grgpc_code[] = {
        0x020014fe,
        0x12004002,
        0xbd0002f6,
-        0x05b04104,
+        0x05b34104,
        0x400010fe,
        0x00f60700,
        0x0204bd00,
@@ -308,259 +308,259 @@ uint32_t gm107_grgpc_code[] = {
        0xc900800f,
        0x0002f601,
        0x308e04bd,
-        0x24bd500c,
+        0xe5f0500c,
-        0x44bd34bd,
+        0xbd24bd01,
-/* 0x03b0: init_unk_loop */
+/* 0x03b3: init_unk_loop */
-        0x0000657e,
+        0x7e44bd34,
-        0xf400f6b0,
+        0xb0000065,
-        0x010f0e0b,
+        0x0bf400f6,
-        0xfd04f2bb,
+        0xbb010f0e,
-        0x30b6054f,
+        0x4ffd04f2,
-/* 0x03c5: init_unk_next */
+        0x0130b605,
-        0x0120b601,
+/* 0x03c8: init_unk_next */
-        0xb004e0b6,
+        0xb60120b6,
-        0x1bf40226,
+        0x26b004e0,
-/* 0x03d1: init_unk_done */
+        0xe21bf402,
-        0x0703b5e2,
+/* 0x03d4: init_unk_done */
-        0x820804b5,
+        0xb50703b5,
-        0xcf020100,
+        0x00820804,
-        0x34bd0022,
+        0x22cf0201,
-        0x80082595,
+        0x9534bd00,
-        0xf601c000,
+        0x00800825,
+        0x05f601c0,
+        0x8004bd00,
+        0xf601c100,
        0x04bd0005,
-        0x01c10080,
+        0x98000e98,
-        0xbd0005f6,
+        0x207e010f,
-        0x000e9804,
+        0x2fbb0001,
-        0x7e010f98,
+        0x003fbb00,
-        0xbb000120,
+        0x98010e98,
-        0x3fbb002f,
+        0x207e020f,
-        0x010e9800,
+        0x0e980001,
-        0x7e020f98,
+        0x00effd05,
-        0x98000120,
+        0xbb002ebb,
-        0xeffd050e,
+        0x0e98003e,
-        0x002ebb00,
+        0x030f9802,
-        0x98003ebb,
+        0x0001207e,
-        0x0f98020e,
+        0xfd070e98,
-        0x01207e03,
+        0x2ebb00ef,
-        0x070e9800,
+        0x003ebb00,
-        0xbb00effd,
+        0x800235b6,
-        0x3ebb002e,
+        0xf601d300,
-        0x0235b600,
+        0x04bd0003,
-        0x01d30080,
+        0xb60825b6,
-        0xbd0003f6,
+        0x20b60635,
-        0x0825b604,
+        0x0130b601,
-        0xb60635b6,
+        0xb60824b6,
-        0x30b60120,
+        0x2fb20834,
-        0x0824b601,
+        0x0002687e,
-        0xb20834b6,
+        0xbb002fbb,
-        0x02687e2f,
+        0x3f0f003f,
-        0x002fbb00,
+        0x501d608e,
-        0x0f003fbb,
+        0xb201e5f0,
-        0x8effb23f,
+        0x008f7eff,
-        0xf0501d60,
+        0x8e0c0f00,
-        0x8f7e01e5,
-        0x0c0f0000,
-        0xa88effb2,
-        0xe5f0501d,
-        0x008f7e01,
-        0x03147e00,
-        0xb23f0f00,
-        0x1d608eff,
-        0x01e5f050,
-        0x00008f7e,
-        0xffb2000f,
-        0x501d9c8e,
-        0x7e01e5f0,
-        0x0f00008f,
-        0x03147e01,
-        0x8effb200,
        0xf0501da8,
-        0x8f7e01e5,
+        0xffb201e5,
-        0xff0f0000,
+        0x00008f7e,
-        0x988effb2,
+        0x0003147e,
+        0x608e3f0f,
        0xe5f0501d,
-        0x008f7e01,
+        0x7effb201,
-        0xb2020f00,
+        0x0f00008f,
-        0x1da88eff,
+        0x1d9c8e00,
        0x01e5f050,
-        0x00008f7e,
+        0x8f7effb2,
+        0x010f0000,
        0x0003147e,
-        0x85050498,
+        0x501da88e,
-        0x98504000,
+        0xb201e5f0,
-        0x64b60406,
+        0x008f7eff,
-        0x0056bb0f,
+        0x8eff0f00,
-/* 0x04e0: tpc_strand_init_tpc_loop */
+        0xf0501d98,
-        0x05705eb8,
+        0xffb201e5,
-        0x00657e00,
-        0xbdf6b200,
-/* 0x04ed: tpc_strand_init_idx_loop */
-        0x605eb874,
-        0x7fb20005,
-        0x00008f7e,
-        0x05885eb8,
-        0x082f9500,
-        0x00008f7e,
-        0x058c5eb8,
-        0x082f9500,
        0x00008f7e,
-        0x05905eb8,
+        0xa88e020f,
-        0x00657e00,
-        0x06f5b600,
-        0xb601f0b6,
-        0x2fbb08f4,
-        0x003fbb00,
-        0xb60170b6,
-        0x1bf40162,
-        0x0050b7bf,
-        0x0142b608,
-        0x0fa81bf4,
-        0x8effb23f,
-        0xf0501d60,
-        0x8f7e01e5,
-        0x0d0f0000,
-        0xa88effb2,
        0xe5f0501d,
-        0x008f7e01,
+        0x7effb201,
-        0x03147e00,
+        0x7e00008f,
-        0x01008000,
+        0x98000314,
-        0x0003f602,
+        0x00850504,
-        0x24bd04bd,
+        0x06985040,
-        0x801f29f0,
+        0x0f64b604,
-        0xf6023000,
+/* 0x04e3: tpc_strand_init_tpc_loop */
-        0x04bd0002,
+        0xb80056bb,
-/* 0x0574: main */
+        0x0005705e,
-        0xf40031f4,
+        0x0000657e,
-        0x240d0028,
+        0x74bdf6b2,
-        0x0000377e,
+/* 0x04f0: tpc_strand_init_idx_loop */
-        0xb0f401f4,
+        0x05605eb8,
-        0x18f404e4,
+        0x7e7fb200,
-        0x0181fe1d,
+        0xb800008f,
-        0x20bd0602,
+        0x0005885e,
-        0xb60412fd,
+        0x7e082f95,
-        0x1efd01e4,
+        0xb800008f,
-        0x0018fe05,
+        0x00058c5e,
-        0x0006477e,
+        0x7e082f95,
-/* 0x05a3: main_not_ctx_xfer */
+        0xb800008f,
-        0x94d40ef4,
+        0x0005905e,
-        0xf5f010ef,
+        0x0000657e,
-        0x02f87e01,
+        0xb606f5b6,
-        0xc70ef400,
+        0xf4b601f0,
-/* 0x05b0: ih */
+        0x002fbb08,
-        0x88fe80f9,
+        0xb6003fbb,
-        0xf980f901,
+        0x62b60170,
-        0xf9a0f990,
+        0xbf1bf401,
-        0xf9d0f9b0,
+        0x080050b7,
-        0xbdf0f9e0,
+        0xf40142b6,
-        0x02004a04,
+        0x3f0fa81b,
-        0xc400aacf,
+        0x501d608e,
-        0x0bf404ab,
+        0xb201e5f0,
-        0x4e240d1f,
+        0x008f7eff,
-        0xeecf1a00,
+        0x8e0d0f00,
-        0x19004f00,
+        0xf0501da8,
-        0x7e00ffcf,
+        0xffb201e5,
-        0x0e000004,
+        0x00008f7e,
-        0x1d004001,
+        0x0003147e,
-        0xbd000ef6,
+        0x02010080,
-/* 0x05ed: ih_no_fifo */
+        0xbd0003f6,
-        0x01004004,
+        0xf024bd04,
-        0xbd000af6,
+        0x00801f29,
-        0xfcf0fc04,
+        0x02f60230,
-        0xfcd0fce0,
+/* 0x0577: main */
-        0xfca0fcb0,
+        0xf404bd00,
-        0xfe80fc90,
+        0x28f40031,
-        0x80fc0088,
+        0x7e240d00,
-        0xf80032f4,
+        0xf4000037,
-/* 0x060d: hub_barrier_done */
+        0xe4b0f401,
-        0x98010f01,
+        0x1d18f404,
-        0xfebb040e,
+        0x020181fe,
-        0x8effb204,
+        0xfd20bd06,
-        0x7e409418,
+        0xe4b60412,
-        0xf800008f,
+        0x051efd01,
-/* 0x0621: ctx_redswitch */
+        0x7e0018fe,
-        0x80200f00,
+        0xf400064a,
+/* 0x05a6: main_not_ctx_xfer */
+        0xef94d40e,
+        0x01f5f010,
+        0x0002f87e,
+/* 0x05b3: ih */
+        0xf9c70ef4,
+        0x0188fe80,
+        0x90f980f9,
+        0xb0f9a0f9,
+        0xe0f9d0f9,
+        0x04bdf0f9,
+        0xcf02004a,
+        0xabc400aa,
+        0x1f0bf404,
+        0x004e240d,
+        0x00eecf1a,
+        0xcf19004f,
+        0x047e00ff,
+        0x010e0000,
+        0xf61d0040,
+        0x04bd000e,
+/* 0x05f0: ih_no_fifo */
+        0xf6010040,
+        0x04bd000a,
+        0xe0fcf0fc,
+        0xb0fcd0fc,
+        0x90fca0fc,
+        0x88fe80fc,
+        0xf480fc00,
+        0x01f80032,
+/* 0x0610: hub_barrier_done */
+        0x0e98010f,
+        0x04febb04,
+        0x188effb2,
+        0x8f7e4094,
+        0x00f80000,
+/* 0x0624: ctx_redswitch */
+        0x0080200f,
+        0x0ff60185,
+        0x0e04bd00,
+/* 0x0631: ctx_redswitch_delay */
+        0x01e2b608,
+        0xf1fd1bf4,
+        0xf10800f5,
+        0x800200f5,
        0xf6018500,
        0x04bd000f,
-/* 0x062e: ctx_redswitch_delay */
+/* 0x064a: ctx_xfer */
-        0xe2b6080e,
+        0x008000f8,
-        0xfd1bf401,
+        0x0ff60281,
-        0x0800f5f1,
+        0x8e04bd00,
-        0x0200f5f1,
+        0xf0501dc4,
-        0x01850080,
+        0xffb201e5,
-        0xbd000ff6,
+        0x00008f7e,
-/* 0x0647: ctx_xfer */
+        0x7e0711f4,
-        0x8000f804,
+/* 0x0667: ctx_xfer_not_load */
-        0xf6028100,
+        0x7e000624,
-        0x04bd000f,
+        0xbd000216,
-        0xc48effb2,
+        0x47fc8024,
-        0xe5f0501d,
-        0x008f7e01,
-        0x0711f400,
-        0x0006217e,
-/* 0x0664: ctx_xfer_not_load */
-        0x0002167e,
-        0xfc8024bd,
-        0x02f60247,
-        0xf004bd00,
-        0x20b6012c,
-        0x4afc8003,
        0x0002f602,
-        0x0c0f04bd,
+        0x2cf004bd,
-        0xa88effb2,
+        0x0320b601,
-        0xe5f0501d,
+        0x024afc80,
-        0x008f7e01,
+        0xbd0002f6,
-        0x03147e00,
+        0x8e0c0f04,
-        0xb23f0f00,
+        0xf0501da8,
-        0x1d608eff,
+        0xffb201e5,
-        0x01e5f050,
        0x00008f7e,
-        0xffb2000f,
+        0x0003147e,
-        0x501d9c8e,
+        0x608e3f0f,
-        0x7e01e5f0,
+        0xe5f0501d,
+        0x7effb201,
        0x0f00008f,
-        0x03147e01,
+        0x1d9c8e00,
-        0x01fcf000,
-        0xb203f0b6,
-        0x1da88eff,
        0x01e5f050,
-        0x00008f7e,
+        0x8f7effb2,
-        0xf001acf0,
+        0x010f0000,
-        0x008b02a5,
+        0x0003147e,
-        0x0c985000,
+        0xb601fcf0,
-        0x0fc4b604,
+        0xa88e03f0,
-        0x9800bcbb,
+        0xe5f0501d,
-        0x0d98000c,
+        0x7effb201,
-        0x7e000e01,
+        0xf000008f,
-        0xf000013d,
-        0x008b01ac,
-        0x0c985040,
-        0x0fc4b604,
-        0x9800bcbb,
-        0x0d98010c,
-        0x060f9802,
-        0x7e08004e,
-        0xf000013d,
        0xa5f001ac,
-        0x30008b04,
+        0x00008b02,
        0x040c9850,
        0xbb0fc4b6,
        0x0c9800bc,
-        0x030d9802,
+        0x010d9800,
-        0x4e080f98,
+        0x3d7e000e,
-        0x3d7e0200,
+        0xacf00001,
-        0x0a7e0001,
+        0x40008b01,
-        0x147e0002,
+        0x040c9850,
-        0x01f40003,
+        0xbb0fc4b6,
-        0x1a12f406,
+        0x0c9800bc,
-/* 0x073c: ctx_xfer_post */
+        0x020d9801,
-        0x0002277e,
+        0x4e060f98,
-        0xffb20d0f,
+        0x3d7e0800,
-        0x501da88e,
+        0xacf00001,
-        0x7e01e5f0,
+        0x04a5f001,
-        0x7e00008f,
+        0x5030008b,
-/* 0x0753: ctx_xfer_done */
+        0xb6040c98,
-        0x7e000314,
+        0xbcbb0fc4,
-        0xf800060d,
+        0x020c9800,
-        0x00000000,
+        0x98030d98,
+        0x004e080f,
+        0x013d7e02,
+        0x020a7e00,
+        0x03147e00,
+        0x0601f400,
+/* 0x073f: ctx_xfer_post */
+        0x7e1a12f4,
+        0x0f000227,
+        0x1da88e0d,
+        0x01e5f050,
+        0x8f7effb2,
+        0x147e0000,
+/* 0x0756: ctx_xfer_done */
+        0x107e0003,
+        0x00f80006,
        0x00000000,
        0x00000000,
        0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index dda7a7d224c9..9f5dfc85147a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -143,7 +143,7 @@ gf100_gr_zbc_depth_get(struct gf100_gr *gr, int format,
 static int
 gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size)
 {
-        struct gf100_gr *gr = (void *)object->engine;
+        struct gf100_gr *gr = gf100_gr(nvkm_gr(object->engine));
        union {
                struct fermi_a_zbc_color_v0 v0;
        } *args = data;
@@ -189,7 +189,7 @@ gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size)
 static int
 gf100_fermi_mthd_zbc_depth(struct nvkm_object *object, void *data, u32 size)
 {
-        struct gf100_gr *gr = (void *)object->engine;
+        struct gf100_gr *gr = gf100_gr(nvkm_gr(object->engine));
        union {
                struct fermi_a_zbc_depth_v0 v0;
        } *args = data;
@@ -1530,6 +1530,8 @@ gf100_gr_oneinit(struct nvkm_gr *base)
                gr->ppc_nr[i]  = gr->func->ppc_nr;
                for (j = 0; j < gr->ppc_nr[i]; j++) {
                        u8 mask = nvkm_rd32(device, GPC_UNIT(i, 0x0c30 + (j * 4)));
+                        if (mask)
+                                gr->ppc_mask[i] |= (1 << j);
                        gr->ppc_tpc_nr[i][j] = hweight8(mask);
                }
        }
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index 4611961b1187..02e78b8d93f6 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -97,6 +97,7 @@ struct gf100_gr {
        u8 tpc_nr[GPC_MAX];
        u8 tpc_total;
        u8 ppc_nr[GPC_MAX];
+        u8 ppc_mask[GPC_MAX];
        u8 ppc_tpc_nr[GPC_MAX][4];
        struct nvkm_memory *unk4188b4;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
index 895ba74057d4..1d7dd38292b3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
@@ -97,7 +97,9 @@ static void *
 nvkm_instobj_dtor(struct nvkm_memory *memory)
 {
        struct nvkm_instobj *iobj = nvkm_instobj(memory);
+        spin_lock(&iobj->imem->lock);
        list_del(&iobj->head);
+        spin_unlock(&iobj->imem->lock);
        nvkm_memory_del(&iobj->parent);
        return iobj;
 }
@@ -190,7 +192,9 @@ nvkm_instobj_new(struct nvkm_instmem *imem, u32 size, u32 align, bool zero,
                nvkm_memory_ctor(&nvkm_instobj_func_slow, &iobj->memory);
                iobj->parent = memory;
                iobj->imem = imem;
+                spin_lock(&iobj->imem->lock);
                list_add_tail(&iobj->head, &imem->list);
+                spin_unlock(&iobj->imem->lock);
                memory = &iobj->memory;
        }
@@ -309,5 +313,6 @@ nvkm_instmem_ctor(const struct nvkm_instmem_func *func,
 {
        nvkm_subdev_ctor(&nvkm_instmem, device, index, 0, &imem->subdev);
        imem->func = func;
+        spin_lock_init(&imem->lock);
        INIT_LIST_HEAD(&imem->list);
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
index b61509e26ec9..b735173a18ff 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c
@@ -59,7 +59,7 @@ gk104_volt_set(struct nvkm_volt *base, u32 uv)
        duty = (uv - bios->base) * div / bios->pwm_range;
        nvkm_wr32(device, 0x20340, div);
-        nvkm_wr32(device, 0x20344, 0x8000000 | duty);
+        nvkm_wr32(device, 0x20344, 0x80000000 | duty);
        return 0;
 }
author	Dave Airlie <airlied@redhat.com>	2015-11-27 15:50:34 -0500
committer	Dave Airlie <airlied@redhat.com>	2015-11-27 15:50:34 -0500
commit	8c14f72b57570d71afda03c5c51b06f0b4af4367 (patch)
tree	09a6098c9539a29d2bba40387aaef53acf8fb20b
parent	2f1371614a5d49428846b90673a89036518dffad (diff)
parent	ef0e9f551899d10834da3d262f20f84db61d64b3 (diff)