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

Commit cfd10811 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes 

two more fixes for issues nouveau found in fedora 26.

* 'linux-4.13' of git://github.com/skeggsb/linux:
  drm/nouveau/bar/gf100: fix access to upper half of BAR2
  drm/nouveau/disp/nv50-: bump max chans to 21
parents 739b0009 38bcb208

drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct nv50_disp { 
		u8 type[3];

	} pior;



	struct nv50_disp_chan *chan[17];

	struct nv50_disp_chan *chan[21];

};



void nv50_disp_super_1(struct nv50_disp *);

drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ gf100_bar_init(struct nvkm_bar *base) 


	if (bar->bar[0].mem) {

		addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;

		nvkm_wr32(device, 0x001714, 0xc0000000 | addr);

		nvkm_wr32(device, 0x001714, 0x80000000 | addr);

	}



	return 0;