drm/nouveau/mc: rename struct nvkm_mc_intr to nvkm_mc_map

This will also be used to define NV_PMC_ENABLE <-> subdev mappings in an
upcoming commit.

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
index 954fbbe56c4ba1a15ff4b450d799bdb14c7099d1..e6c5bc461ba6adcdde4d8b0625235142993405f6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c
@@ -58,7 +58,7 @@ nvkm_mc_intr(struct nvkm_mc *mc, bool *handled)
 {
        struct nvkm_device *device = mc->subdev.device;
        struct nvkm_subdev *subdev;
-       const struct nvkm_mc_intr *map = mc->func->intr;
+       const struct nvkm_mc_map *map = mc->func->intr;
        u32 stat, intr;
 
        stat = intr = nvkm_mc_intr_mask(mc);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
index 7344ad659105c9883f200ce7dd6d9b08eb1530bd..7fc34bc98e058415350bcfcbd88ef427fb7a1da1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
@@ -23,7 +23,7 @@
  */
 #include "priv.h"
 
-static const struct nvkm_mc_intr
+static const struct nvkm_mc_map
 g98_mc_intr[] = {
        { 0x04000000, NVKM_ENGINE_DISP },  /* DISP first, so pageflip timestamps work */
        { 0x00000001, NVKM_ENGINE_MSPPP },

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c
index 122fe69e83e41227ac86f494581586e6f89da734..ffcdbbd9efa532d02e8355cab4b71e8e64bd3697 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c
@@ -23,7 +23,7 @@
  */
 #include "priv.h"
 
-const struct nvkm_mc_intr
+const struct nvkm_mc_map
 gf100_mc_intr[] = {
        { 0x04000000, NVKM_ENGINE_DISP },  /* DISP first, so pageflip timestamps work. */
        { 0x00000001, NVKM_ENGINE_MSPPP },

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
index d282ec1555f864742b941cc661e1002615bbf17e..1300c8db068c1d962e6f3bd2e45f1c2f5b257e0c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
@@ -23,7 +23,7 @@
  */
 #include "priv.h"
 
-const struct nvkm_mc_intr
+const struct nvkm_mc_map
 nv04_mc_intr[] = {
        { 0x00000001, NVKM_ENGINE_MPEG },       /* NV17- MPEG/ME */
        { 0x00000100, NVKM_ENGINE_FIFO },

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c
index 5f27d7b8fddda2aa64e7ea93ded3619112bac430..e5c1ccd7eba6ca2d5df1e2dc96ed1d281ef3b9b9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c
@@ -23,7 +23,7 @@
  */
 #include "priv.h"
 
-const struct nvkm_mc_intr
+const struct nvkm_mc_map
 nv50_mc_intr[] = {
        { 0x04000000, NVKM_ENGINE_DISP },  /* DISP before FIFO, so pageflip-timestamping works! */
        { 0x00000001, NVKM_ENGINE_MPEG },

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
index 307f6c6922879eec61f5af8035a18dc0aa948274..fa2b2d610f1b01c6ed7a77a5affe61fca9f17075 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
@@ -6,14 +6,14 @@
 int nvkm_mc_new_(const struct nvkm_mc_func *, struct nvkm_device *,
                 int index, struct nvkm_mc **);
 
-struct nvkm_mc_intr {
+struct nvkm_mc_map {
        u32 stat;
        u32 unit;
 };
 
 struct nvkm_mc_func {
        void (*init)(struct nvkm_mc *);
-       const struct nvkm_mc_intr *intr;
+       const struct nvkm_mc_map *intr;
        /* disable reporting of interrupts to host */
        void (*intr_unarm)(struct nvkm_mc *);
        /* enable reporting of interrupts to host */
@@ -24,7 +24,7 @@ struct nvkm_mc_func {
 };
 
 void nv04_mc_init(struct nvkm_mc *);
-extern const struct nvkm_mc_intr nv04_mc_intr[];
+extern const struct nvkm_mc_map nv04_mc_intr[];
 void nv04_mc_intr_unarm(struct nvkm_mc *);
 void nv04_mc_intr_rearm(struct nvkm_mc *);
 u32 nv04_mc_intr_mask(struct nvkm_mc *);
@@ -32,9 +32,9 @@ u32 nv04_mc_intr_mask(struct nvkm_mc *);
 void nv44_mc_init(struct nvkm_mc *);
 
 void nv50_mc_init(struct nvkm_mc *);
-extern const struct nvkm_mc_intr nv50_mc_intr[];
+extern const struct nvkm_mc_map nv50_mc_intr[];
 
-extern const struct nvkm_mc_intr gf100_mc_intr[];
+extern const struct nvkm_mc_map gf100_mc_intr[];
 void gf100_mc_intr_unarm(struct nvkm_mc *);
 void gf100_mc_intr_rearm(struct nvkm_mc *);
 u32 gf100_mc_intr_mask(struct nvkm_mc *);