Commit c9e70592 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/bar: remove NV_PMC_ENABLE_PFIFO twiddling

It's handled by FIFO preinit() now.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e69dae85
...@@ -124,9 +124,6 @@ gf100_bar_init(struct nvkm_bar *base) ...@@ -124,9 +124,6 @@ gf100_bar_init(struct nvkm_bar *base)
struct nvkm_device *device = bar->base.subdev.device; struct nvkm_device *device = bar->base.subdev.device;
u32 addr; u32 addr;
nvkm_mask(device, 0x000200, 0x00000100, 0x00000000);
nvkm_mask(device, 0x000200, 0x00000100, 0x00000100);
addr = nvkm_memory_addr(bar->bar[1].mem) >> 12; addr = nvkm_memory_addr(bar->bar[1].mem) >> 12;
nvkm_wr32(device, 0x001704, 0x80000000 | addr); nvkm_wr32(device, 0x001704, 0x80000000 | addr);
......
...@@ -151,9 +151,6 @@ nv50_bar_init(struct nvkm_bar *base) ...@@ -151,9 +151,6 @@ nv50_bar_init(struct nvkm_bar *base)
struct nvkm_device *device = bar->base.subdev.device; struct nvkm_device *device = bar->base.subdev.device;
int i; int i;
nvkm_mask(device, 0x000200, 0x00000100, 0x00000000);
nvkm_mask(device, 0x000200, 0x00000100, 0x00000100);
nvkm_wr32(device, 0x001704, 0x00000000 | bar->mem->addr >> 12); nvkm_wr32(device, 0x001704, 0x00000000 | bar->mem->addr >> 12);
nvkm_wr32(device, 0x001704, 0x40000000 | bar->mem->addr >> 12); nvkm_wr32(device, 0x001704, 0x40000000 | bar->mem->addr >> 12);
nvkm_wr32(device, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4); nvkm_wr32(device, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment