p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/mc/nv04: define reset masks + intr cleanup 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-04-08 17:24:40 +10:00
parent 667e99ab23
commit d85e2a8dd8
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
View File

@ -30,18 +30,13 @@ nv04_mc_reset[] = {
{} {}
}; };
const struct nvkm_mc_map static const struct nvkm_mc_map
nv04_mc_intr[] = { nv04_mc_intr[] = {
{ 0x00000001, NVKM_ENGINE_MPEG }, /* NV17- MPEG/ME */ { 0x01010000, NVKM_ENGINE_DISP },
{ 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00001000, NVKM_ENGINE_GR }, { 0x00001000, NVKM_ENGINE_GR },
{ 0x00010000, NVKM_ENGINE_DISP }, { 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00020000, NVKM_ENGINE_VP }, /* NV40- */
{ 0x00100000, NVKM_SUBDEV_TIMER },
{ 0x01000000, NVKM_ENGINE_DISP }, /* NV04- PCRTC0 */
{ 0x02000000, NVKM_ENGINE_DISP }, /* NV11- PCRTC1 */
{ 0x10000000, NVKM_SUBDEV_BUS }, { 0x10000000, NVKM_SUBDEV_BUS },
{ 0x80000000, NVKM_ENGINE_SW }, { 0x00100000, NVKM_SUBDEV_TIMER },
{} {}
}; };
@ -81,6 +76,7 @@ nv04_mc = {
.intr_unarm = nv04_mc_intr_unarm, .intr_unarm = nv04_mc_intr_unarm,
.intr_rearm = nv04_mc_intr_rearm, .intr_rearm = nv04_mc_intr_rearm,
.intr_mask = nv04_mc_intr_mask, .intr_mask = nv04_mc_intr_mask,
.reset = nv04_mc_reset,
}; };
int int

1
drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
View File

@ -25,7 +25,6 @@ struct nvkm_mc_func {
}; };
void nv04_mc_init(struct nvkm_mc *); void nv04_mc_init(struct nvkm_mc *);
extern const struct nvkm_mc_map nv04_mc_intr[];
void nv04_mc_intr_unarm(struct nvkm_mc *); void nv04_mc_intr_unarm(struct nvkm_mc *);
void nv04_mc_intr_rearm(struct nvkm_mc *); void nv04_mc_intr_rearm(struct nvkm_mc *);
u32 nv04_mc_intr_mask(struct nvkm_mc *); u32 nv04_mc_intr_mask(struct nvkm_mc *);