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

Commit 6e09a578 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: s/intr_mask/intr_stat/ 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3c2a536b

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

+3 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ nvkm_mc_intr_rearm(struct nvkm_device *device) 
}



static u32

nvkm_mc_intr_mask(struct nvkm_mc *mc)

nvkm_mc_intr_stat(struct nvkm_mc *mc)

{

	u32 intr = mc->func->intr_mask(mc);

	u32 intr = mc->func->intr_stat(mc);

	if (WARN_ON_ONCE(intr == 0xffffffff))

		intr = 0; /* likely fallen off the bus */

	return intr;
@@ -71,7 +71,7 @@ nvkm_mc_intr(struct nvkm_device *device, bool *handled) 
	if (unlikely(!mc))

		return;



	intr = nvkm_mc_intr_mask(mc);

	intr = nvkm_mc_intr_stat(mc);

	stat = nvkm_top_intr(device, intr, &subdevs);

	while (subdevs) {

		enum nvkm_devidx subidx = __ffs64(subdevs);

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ g84_mc = { 
	.intr = g84_mc_intr,

	.intr_unarm = nv04_mc_intr_unarm,

	.intr_rearm = nv04_mc_intr_rearm,

	.intr_mask = nv04_mc_intr_mask,

	.intr_stat = nv04_mc_intr_stat,

	.reset = g84_mc_reset,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ g98_mc = { 
	.intr = g98_mc_intr,

	.intr_unarm = nv04_mc_intr_unarm,

	.intr_rearm = nv04_mc_intr_rearm,

	.intr_mask = nv04_mc_intr_mask,

	.intr_stat = nv04_mc_intr_stat,

	.reset = g98_mc_reset,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ gf100_mc_intr_rearm(struct nvkm_mc *mc) 
}



u32

gf100_mc_intr_mask(struct nvkm_mc *mc)

gf100_mc_intr_stat(struct nvkm_mc *mc)

{

	struct nvkm_device *device = mc->subdev.device;

	u32 intr0 = nvkm_rd32(device, 0x000100);
@@ -96,7 +96,7 @@ gf100_mc = { 
	.intr = gf100_mc_intr,

	.intr_unarm = gf100_mc_intr_unarm,

	.intr_rearm = gf100_mc_intr_rearm,

	.intr_mask = gf100_mc_intr_mask,

	.intr_stat = gf100_mc_intr_stat,

	.reset = gf100_mc_reset,

	.unk260 = gf100_mc_unk260,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ gk104_mc = { 
	.intr = gk104_mc_intr,

	.intr_unarm = gf100_mc_intr_unarm,

	.intr_rearm = gf100_mc_intr_rearm,

	.intr_mask = gf100_mc_intr_mask,

	.intr_stat = gf100_mc_intr_stat,

	.reset = gk104_mc_reset,

	.unk260 = gf100_mc_unk260,

};