UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/mmu: switch to subdev printk macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:12 +10:00
parent c47a48a544
commit 85ae830f5a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c
View File

@ -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);
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;
}

9
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c
View File

@ -146,14 +146,15 @@ static void
nv50_vm_flush(struct nvkm_vm *vm)
{
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_engine *engine;
int i, vme;
bar->flush(bar);
mutex_lock(&nv_subdev(mmu)->mutex);
mutex_lock(&subdev->mutex);
for (i = 0; i < NVDEV_SUBDEV_NR; i++) {
if (!atomic_read(&vm->engref[i]))
continue;
@ -186,9 +187,9 @@ nv50_vm_flush(struct nvkm_vm *vm)
if (!(nvkm_rd32(device, 0x100c80) & 0x00000001))
break;
) < 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