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

three nouveau regression fixes.
* 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/device: enable c800 quirk for tecra w50
  drm/nouveau/clk/gt215: Unbreak engine pausing for GT21x/MCP7x
  drm/nouveau/gr/nv04: fix big endian setting on gr context

3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 9dd1cac81e80..e8eb14e438f4 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -689,6 +689,7 @@ nvkm_device_pci_10de_11e3[] = {
 
 static const struct nvkm_device_pci_vendor
 nvkm_device_pci_10de_11fc[] = {
+        { 0x1179, 0x0001, NULL, { .War00C800_0 = true } }, /* Toshiba Tecra W50 */
         { 0x17aa, 0x2211, NULL, { .War00C800_0 = true } }, /* Lenovo W541 */
         { 0x17aa, 0x221e, NULL, { .War00C800_0 = true } }, /* Lenovo W541 */
         {}
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
index 426ba0025a8d..85c5b7fea5f5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
@@ -1048,11 +1048,11 @@ nv04_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
         if (ret == 0) {
                 nvkm_kmap(*pgpuobj);
                 nvkm_wo32(*pgpuobj, 0x00, object->oclass);
-                nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
-                nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
 #ifdef __BIG_ENDIAN
-                nvkm_mo32(*pgpuobj, 0x08, 0x00080000, 0x00080000);
+                nvkm_mo32(*pgpuobj, 0x00, 0x00080000, 0x00080000);
 #endif
+                nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
+                nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
                 nvkm_wo32(*pgpuobj, 0x0c, 0x00000000);
                 nvkm_done(*pgpuobj);
         }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
index 07feae620c8d..c233e3f653ce 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
@@ -326,7 +326,7 @@ gt215_clk_pre(struct nvkm_clk *clk, unsigned long *flags)
                 return -EIO;
 
         if (nvkm_msec(device, 2000,
-                u32 tmp = nvkm_rd32(device, 0x002504) & 0x0000003f;
+                u32 tmp = nvkm_rd32(device, 0x00251c) & 0x0000003f;
                 if (tmp == 0x0000003f)
                         break;
         ) < 0)