mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
drm/nouveau/mmu: switch to subdev printk macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
c47a48a544
commit
85ae830f5a
2 changed files with 6 additions and 5 deletions
|
@ -187,7 +187,7 @@ nv44_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
|
||||||
|
|
||||||
mmu->nullp = pci_alloc_consistent(device->pdev, 16 * 1024, &mmu->null);
|
mmu->nullp = pci_alloc_consistent(device->pdev, 16 * 1024, &mmu->null);
|
||||||
if (!mmu->nullp) {
|
if (!mmu->nullp) {
|
||||||
nv_warn(mmu, "unable to allocate dummy pages\n");
|
nvkm_warn(&mmu->base.subdev, "unable to allocate dummy pages\n");
|
||||||
mmu->null = 0;
|
mmu->null = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -146,14 +146,15 @@ static void
|
||||||
nv50_vm_flush(struct nvkm_vm *vm)
|
nv50_vm_flush(struct nvkm_vm *vm)
|
||||||
{
|
{
|
||||||
struct nvkm_mmu *mmu = (void *)vm->mmu;
|
struct nvkm_mmu *mmu = (void *)vm->mmu;
|
||||||
struct nvkm_device *device = mmu->subdev.device;
|
struct nvkm_subdev *subdev = &mmu->subdev;
|
||||||
|
struct nvkm_device *device = subdev->device;
|
||||||
struct nvkm_bar *bar = device->bar;
|
struct nvkm_bar *bar = device->bar;
|
||||||
struct nvkm_engine *engine;
|
struct nvkm_engine *engine;
|
||||||
int i, vme;
|
int i, vme;
|
||||||
|
|
||||||
bar->flush(bar);
|
bar->flush(bar);
|
||||||
|
|
||||||
mutex_lock(&nv_subdev(mmu)->mutex);
|
mutex_lock(&subdev->mutex);
|
||||||
for (i = 0; i < NVDEV_SUBDEV_NR; i++) {
|
for (i = 0; i < NVDEV_SUBDEV_NR; i++) {
|
||||||
if (!atomic_read(&vm->engref[i]))
|
if (!atomic_read(&vm->engref[i]))
|
||||||
continue;
|
continue;
|
||||||
|
@ -186,9 +187,9 @@ nv50_vm_flush(struct nvkm_vm *vm)
|
||||||
if (!(nvkm_rd32(device, 0x100c80) & 0x00000001))
|
if (!(nvkm_rd32(device, 0x100c80) & 0x00000001))
|
||||||
break;
|
break;
|
||||||
) < 0)
|
) < 0)
|
||||||
nv_error(mmu, "vm flush timeout: engine %d\n", vme);
|
nvkm_error(subdev, "vm flush timeout: engine %d\n", vme);
|
||||||
}
|
}
|
||||||
mutex_unlock(&nv_subdev(mmu)->mutex);
|
mutex_unlock(&subdev->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
Loading…
Reference in a new issue