From 2ca0ddbc03917f94c6d34820f91d0c920c057df2 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:07 +1000 Subject: [PATCH] drm/nouveau/mc: cosmetic changes This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs --- .../gpu/drm/nouveau/include/nvkm/subdev/mc.h | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 80 +++++++++---------- .../gpu/drm/nouveau/nvkm/subdev/mc/gf100.c | 9 +-- drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c | 14 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h | 4 - drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c | 5 +- drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c | 16 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c | 10 +-- 8 files changed, 67 insertions(+), 73 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h index 055bea7702a1..726e3f02e3ec 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h @@ -3,7 +3,7 @@ #include struct nvkm_mc { - struct nvkm_subdev base; + struct nvkm_subdev subdev; bool use_msi; unsigned int irq; void (*unk260)(struct nvkm_mc *, u32); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c index 8699e5b2f497..3aa6efcf6725 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c @@ -26,17 +26,17 @@ #include static inline void -nvkm_mc_unk260(struct nvkm_mc *pmc, u32 data) +nvkm_mc_unk260(struct nvkm_mc *mc, u32 data) { - const struct nvkm_mc_oclass *impl = (void *)nv_oclass(pmc); + const struct nvkm_mc_oclass *impl = (void *)nv_oclass(mc); if (impl->unk260) - impl->unk260(pmc, data); + impl->unk260(mc, data); } static inline u32 -nvkm_mc_intr_mask(struct nvkm_mc *pmc) +nvkm_mc_intr_mask(struct nvkm_mc *mc) { - u32 intr = nv_rd32(pmc, 0x000100); + u32 intr = nv_rd32(mc, 0x000100); if (intr == 0xffffffff) /* likely fallen off the bus */ intr = 0x00000000; return intr; @@ -45,23 +45,23 @@ nvkm_mc_intr_mask(struct nvkm_mc *pmc) static irqreturn_t nvkm_mc_intr(int irq, void *arg) { - struct nvkm_mc *pmc = arg; - const struct nvkm_mc_oclass *oclass = (void *)nv_object(pmc)->oclass; + struct nvkm_mc *mc = arg; + const struct nvkm_mc_oclass *oclass = (void *)nv_object(mc)->oclass; const struct nvkm_mc_intr *map = oclass->intr; struct nvkm_subdev *unit; u32 intr; - nv_wr32(pmc, 0x000140, 0x00000000); - nv_rd32(pmc, 0x000140); - intr = nvkm_mc_intr_mask(pmc); - if (pmc->use_msi) - oclass->msi_rearm(pmc); + nv_wr32(mc, 0x000140, 0x00000000); + nv_rd32(mc, 0x000140); + intr = nvkm_mc_intr_mask(mc); + if (mc->use_msi) + oclass->msi_rearm(mc); if (intr) { - u32 stat = intr = nvkm_mc_intr_mask(pmc); + u32 stat = intr = nvkm_mc_intr_mask(mc); while (map->stat) { if (intr & map->stat) { - unit = nvkm_subdev(pmc, map->unit); + unit = nvkm_subdev(mc, map->unit); if (unit && unit->intr) unit->intr(unit); stat &= ~map->stat; @@ -70,29 +70,29 @@ nvkm_mc_intr(int irq, void *arg) } if (stat) - nv_error(pmc, "unknown intr 0x%08x\n", stat); + nv_error(mc, "unknown intr 0x%08x\n", stat); } - nv_wr32(pmc, 0x000140, 0x00000001); + nv_wr32(mc, 0x000140, 0x00000001); return intr ? IRQ_HANDLED : IRQ_NONE; } int _nvkm_mc_fini(struct nvkm_object *object, bool suspend) { - struct nvkm_mc *pmc = (void *)object; - nv_wr32(pmc, 0x000140, 0x00000000); - return nvkm_subdev_fini(&pmc->base, suspend); + struct nvkm_mc *mc = (void *)object; + nv_wr32(mc, 0x000140, 0x00000000); + return nvkm_subdev_fini(&mc->subdev, suspend); } int _nvkm_mc_init(struct nvkm_object *object) { - struct nvkm_mc *pmc = (void *)object; - int ret = nvkm_subdev_init(&pmc->base); + struct nvkm_mc *mc = (void *)object; + int ret = nvkm_subdev_init(&mc->subdev); if (ret) return ret; - nv_wr32(pmc, 0x000140, 0x00000001); + nv_wr32(mc, 0x000140, 0x00000001); return 0; } @@ -100,11 +100,11 @@ void _nvkm_mc_dtor(struct nvkm_object *object) { struct nvkm_device *device = nv_device(object); - struct nvkm_mc *pmc = (void *)object; - free_irq(pmc->irq, pmc); - if (pmc->use_msi) + struct nvkm_mc *mc = (void *)object; + free_irq(mc->irq, mc); + if (mc->use_msi) pci_disable_msi(device->pdev); - nvkm_subdev_destroy(&pmc->base); + nvkm_subdev_destroy(&mc->subdev); } int @@ -113,16 +113,16 @@ nvkm_mc_create_(struct nvkm_object *parent, struct nvkm_object *engine, { const struct nvkm_mc_oclass *oclass = (void *)bclass; struct nvkm_device *device = nv_device(parent); - struct nvkm_mc *pmc; + struct nvkm_mc *mc; int ret; ret = nvkm_subdev_create_(parent, engine, bclass, 0, "PMC", "master", length, pobject); - pmc = *pobject; + mc = *pobject; if (ret) return ret; - pmc->unk260 = nvkm_mc_unk260; + mc->unk260 = nvkm_mc_unk260; if (nv_device_is_pci(device)) { switch (device->pdev->device & 0x0ff0) { @@ -136,31 +136,31 @@ nvkm_mc_create_(struct nvkm_object *parent, struct nvkm_object *engine, /* reported broken, nv also disable it */ break; default: - pmc->use_msi = true; + mc->use_msi = true; break; } } - pmc->use_msi = nvkm_boolopt(device->cfgopt, "NvMSI", - pmc->use_msi); + mc->use_msi = nvkm_boolopt(device->cfgopt, "NvMSI", + mc->use_msi); - if (pmc->use_msi && oclass->msi_rearm) { - pmc->use_msi = pci_enable_msi(device->pdev) == 0; - if (pmc->use_msi) { - nv_info(pmc, "MSI interrupts enabled\n"); - oclass->msi_rearm(pmc); + if (mc->use_msi && oclass->msi_rearm) { + mc->use_msi = pci_enable_msi(device->pdev) == 0; + if (mc->use_msi) { + nv_info(mc, "MSI interrupts enabled\n"); + oclass->msi_rearm(mc); } } else { - pmc->use_msi = false; + mc->use_msi = false; } } ret = nv_device_get_irq(device, true); if (ret < 0) return ret; - pmc->irq = ret; + mc->irq = ret; - ret = request_irq(pmc->irq, nvkm_mc_intr, IRQF_SHARED, "nvkm", pmc); + ret = request_irq(mc->irq, nvkm_mc_intr, IRQF_SHARED, "nvkm", mc); if (ret < 0) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c index 2425984b045e..a2c4dbe64eeb 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c @@ -49,16 +49,15 @@ gf100_mc_intr[] = { }; static void -gf100_mc_msi_rearm(struct nvkm_mc *pmc) +gf100_mc_msi_rearm(struct nvkm_mc *mc) { - struct nv04_mc_priv *priv = (void *)pmc; - nv_wr32(priv, 0x088704, 0x00000000); + nv_wr32(mc, 0x088704, 0x00000000); } void -gf100_mc_unk260(struct nvkm_mc *pmc, u32 data) +gf100_mc_unk260(struct nvkm_mc *mc, u32 data) { - nv_wr32(pmc, 0x000260, data); + nv_wr32(mc, 0x000260, data); } struct nvkm_oclass * diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c index 32713827b4dc..84670aac664f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c @@ -41,12 +41,12 @@ nv04_mc_intr[] = { int nv04_mc_init(struct nvkm_object *object) { - struct nv04_mc_priv *priv = (void *)object; + struct nvkm_mc *mc = (void *)object; - nv_wr32(priv, 0x000200, 0xffffffff); /* everything enabled */ - nv_wr32(priv, 0x001850, 0x00000001); /* disable rom access */ + nv_wr32(mc, 0x000200, 0xffffffff); /* everything enabled */ + nv_wr32(mc, 0x001850, 0x00000001); /* disable rom access */ - return nvkm_mc_init(&priv->base); + return nvkm_mc_init(mc); } int @@ -54,11 +54,11 @@ nv04_mc_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct nv04_mc_priv *priv; + struct nvkm_mc *mc; int ret; - ret = nvkm_mc_create(parent, engine, oclass, &priv); - *pobject = nv_object(priv); + ret = nvkm_mc_create(parent, engine, oclass, &mc); + *pobject = nv_object(mc); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h index 411de3d08ab6..aa2e58fa69f0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.h @@ -2,10 +2,6 @@ #define __NVKM_MC_NV04_H__ #include "priv.h" -struct nv04_mc_priv { - struct nvkm_mc base; -}; - int nv04_mc_ctor(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, struct nvkm_object **); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c index b7613059da08..80431b51bf62 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c @@ -24,10 +24,9 @@ #include "nv04.h" void -nv40_mc_msi_rearm(struct nvkm_mc *pmc) +nv40_mc_msi_rearm(struct nvkm_mc *mc) { - struct nv04_mc_priv *priv = (void *)pmc; - nv_wr08(priv, 0x088068, 0xff); + nv_wr08(mc, 0x088068, 0xff); } struct nvkm_oclass * diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c index 2c7f7c701a2b..63c2d6603f9c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c @@ -26,17 +26,17 @@ int nv44_mc_init(struct nvkm_object *object) { - struct nv04_mc_priv *priv = (void *)object; - u32 tmp = nv_rd32(priv, 0x10020c); + struct nvkm_mc *mc = (void *)object; + u32 tmp = nv_rd32(mc, 0x10020c); - nv_wr32(priv, 0x000200, 0xffffffff); /* everything enabled */ + nv_wr32(mc, 0x000200, 0xffffffff); /* everything enabled */ - nv_wr32(priv, 0x001700, tmp); - nv_wr32(priv, 0x001704, 0); - nv_wr32(priv, 0x001708, 0); - nv_wr32(priv, 0x00170c, tmp); + nv_wr32(mc, 0x001700, tmp); + nv_wr32(mc, 0x001704, 0); + nv_wr32(mc, 0x001708, 0); + nv_wr32(mc, 0x00170c, tmp); - return nvkm_mc_init(&priv->base); + return nvkm_mc_init(mc); } struct nvkm_oclass * diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c index 9c43ddce9992..4387e686ff6b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c @@ -42,18 +42,18 @@ nv50_mc_intr[] = { }; static void -nv50_mc_msi_rearm(struct nvkm_mc *pmc) +nv50_mc_msi_rearm(struct nvkm_mc *mc) { - struct nvkm_device *device = nv_device(pmc); + struct nvkm_device *device = nv_device(mc); pci_write_config_byte(device->pdev, 0x68, 0xff); } int nv50_mc_init(struct nvkm_object *object) { - struct nv04_mc_priv *priv = (void *)object; - nv_wr32(priv, 0x000200, 0xffffffff); /* everything on */ - return nvkm_mc_init(&priv->base); + struct nvkm_mc *mc = (void *)object; + nv_wr32(mc, 0x000200, 0xffffffff); /* everything on */ + return nvkm_mc_init(mc); } struct nvkm_oclass * -- 2.20.1