Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },