Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fbcc7c0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents d1031d57 778613e5

drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */

	{}

drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}

drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c

+1 −1
Original line number Diff line number Diff line
@@ -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)