p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Dave Airlie 2017-07-25 15:41:39 +10:00
parent 739b000994 38bcb208f6
commit cfd1081108
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
View File

@ -22,7 +22,7 @@ struct nv50_disp {
u8 type[3]; u8 type[3];
} pior; } pior;
struct nv50_disp_chan *chan[17]; struct nv50_disp_chan *chan[21];
}; };
void nv50_disp_super_1(struct nv50_disp *); void nv50_disp_super_1(struct nv50_disp *);

2
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
View File

@ -129,7 +129,7 @@ gf100_bar_init(struct nvkm_bar *base)
if (bar->bar[0].mem) { if (bar->bar[0].mem) {
addr = nvkm_memory_addr(bar->bar[0].mem) >> 12; addr = nvkm_memory_addr(bar->bar[0].mem) >> 12;
nvkm_wr32(device, 0x001714, 0xc0000000 | addr); nvkm_wr32(device, 0x001714, 0x80000000 | addr);
} }
return 0; return 0;