evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/mc: switch to subdev printk macros

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:12 +10:00
parent 59e1a2f1a6
commit c47a48a544
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
View file

@ -47,7 +47,8 @@ static irqreturn_t
nvkm_mc_intr(int irq, void *arg) nvkm_mc_intr(int irq, void *arg)
{ {
struct nvkm_mc *mc = arg; struct nvkm_mc *mc = arg;
struct nvkm_device *device = mc->subdev.device; struct nvkm_subdev *subdev = &mc->subdev;
struct nvkm_device *device = subdev->device;
const struct nvkm_mc_oclass *oclass = (void *)nv_object(mc)->oclass; const struct nvkm_mc_oclass *oclass = (void *)nv_object(mc)->oclass;
const struct nvkm_mc_intr *map = oclass->intr; const struct nvkm_mc_intr *map = oclass->intr;
struct nvkm_subdev *unit; struct nvkm_subdev *unit;
@ -72,7 +73,7 @@ nvkm_mc_intr(int irq, void *arg)
} }
if (stat) if (stat)
nv_error(mc, "unknown intr 0x%08x\n", stat); nvkm_error(subdev, "unknown intr %08x\n", stat);
} }
nvkm_wr32(device, 0x000140, 0x00000001); nvkm_wr32(device, 0x000140, 0x00000001);
@ -151,7 +152,7 @@ nvkm_mc_create_(struct nvkm_object *parent, struct nvkm_object *engine,
if (mc->use_msi && oclass->msi_rearm) { if (mc->use_msi && oclass->msi_rearm) {
mc->use_msi = pci_enable_msi(device->pdev) == 0; mc->use_msi = pci_enable_msi(device->pdev) == 0;
if (mc->use_msi) { if (mc->use_msi) {
nv_info(mc, "MSI interrupts enabled\n"); nvkm_debug(&mc->subdev, "MSI enabled\n");
oclass->msi_rearm(mc); oclass->msi_rearm(mc);
} }
} else { } else {