Skip to content

Commit

Permalink
drm/nouveau/bar: remove NV_PMC_ENABLE_PFIFO twiddling
Browse files Browse the repository at this point in the history
It's handled by FIFO preinit() now.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Nov 2, 2017
1 parent e69dae8 commit c9e7059
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ gf100_bar_init(struct nvkm_bar *base)
struct nvkm_device *device = bar->base.subdev.device;
u32 addr;

nvkm_mask(device, 0x000200, 0x00000100, 0x00000000);
nvkm_mask(device, 0x000200, 0x00000100, 0x00000100);

addr = nvkm_memory_addr(bar->bar[1].mem) >> 12;
nvkm_wr32(device, 0x001704, 0x80000000 | addr);

Expand Down
3 changes: 0 additions & 3 deletions drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ nv50_bar_init(struct nvkm_bar *base)
struct nvkm_device *device = bar->base.subdev.device;
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, 0x40000000 | bar->mem->addr >> 12);
nvkm_wr32(device, 0x001708, 0x80000000 | bar->bar1->node->offset >> 4);
Expand Down

0 comments on commit c9e7059

Please sign in to comment.