Commit 87f313e6 authored by Ben Skeggs's avatar Ben Skeggs

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: default avatarBen Skeggs <bskeggs@redhat.com>
parent fb3e9c61
......@@ -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);
......
......@@ -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 },
......
......@@ -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 },
......
......@@ -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 },
......
......@@ -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 },
......
......@@ -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 *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment