drm/nouveau/bar: remove NV_PMC_ENABLE_PFIFO twiddling

It's handled by FIFO preinit() now.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
index 1befe44641556057857a220202e65a61f2e80d37..3a6b2e4c66bac08eb02f3d358c362d38d5b281c6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
@@ -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);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
index 4bfe6db006accc9d72f02591b100ee155ebce3cd..aca65506cbc85c001ffd49800c29fb31305fe4e5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
@@ -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);