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

Commit 8b03d1ed authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next 

Some nouveau regression fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/fb/gf100-: Fix 32 bit wraparound in new ram detection
  drm/nouveau/secboot/gm20b: fix the error return code in gm20b_secboot_tegra_read_wpr()
  drm/nouveau/kms: Increase max retries in scanout position queries.
  drm/nouveau/bios/bitP: check that table is long enough for optional pointers
  drm/nouveau/fifo/nv40: no ctxsw for pre-nv44 mpeg engine
parents 73ba2d5c 271393ba

drivers/gpu/drm/nouveau/nouveau_display.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, 
	};

	struct nouveau_display *disp = nouveau_display(crtc->dev);

	struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)];

	int ret, retry = 1;

	int ret, retry = 20;



	do {

		ret = nvif_mthd(&disp->disp, 0, &args, sizeof(args));

drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ nv40_fifo_dma_engine(struct nvkm_engine *engine, u32 *reg, u32 *ctx) 
		*ctx = 0x38;

		return true;

	case NVKM_ENGINE_MPEG:

		if (engine->subdev.device->chipset < 0x44)

			return false;

		*reg = 0x00330c;

		*ctx = 0x54;

		return true;

drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ nvbios_boostTe(struct nvkm_bios *bios, 
	u32 boost = 0;



	if (!bit_entry(bios, 'P', &bit_P)) {

		if (bit_P.version == 2)

		if (bit_P.version == 2 && bit_P.length >= 0x34)

			boost = nvbios_rd32(bios, bit_P.offset + 0x30);



		if (boost) {

drivers/gpu/drm/nouveau/nvkm/subdev/bios/cstep.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ nvbios_cstepTe(struct nvkm_bios *bios, 
	u32 cstep = 0;



	if (!bit_entry(bios, 'P', &bit_P)) {

		if (bit_P.version == 2)

		if (bit_P.version == 2 && bit_P.length >= 0x38)

			cstep = nvbios_rd32(bios, bit_P.offset + 0x34);



		if (cstep) {

drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ nvbios_fan_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) 
	u32 fan = 0;



	if (!bit_entry(bios, 'P', &bit_P)) {

		if (bit_P.version == 2 && bit_P.length >= 0x5a)

		if (bit_P.version == 2 && bit_P.length >= 0x5c)

			fan = nvbios_rd32(bios, bit_P.offset + 0x58);



		if (fan) {