Commit 2f68234f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc/gp100-: route fault buffer interrupts to FAULT 



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

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

+19 −1
Original line number Diff line number Diff line
@@ -75,10 +75,28 @@ gp100_mc_intr_mask(struct nvkm_mc *base, u32 mask, u32 intr) 
	spin_unlock_irqrestore(&mc->lock, flags);

}



const struct nvkm_mc_map

gp100_mc_intr[] = {

	{ 0x04000000, NVKM_ENGINE_DISP },

	{ 0x00000100, NVKM_ENGINE_FIFO },

	{ 0x00000200, NVKM_SUBDEV_FAULT },

	{ 0x40000000, NVKM_SUBDEV_IBUS },

	{ 0x10000000, NVKM_SUBDEV_BUS },

	{ 0x08000000, NVKM_SUBDEV_FB },

	{ 0x02000000, NVKM_SUBDEV_LTC },

	{ 0x01000000, NVKM_SUBDEV_PMU },

	{ 0x00200000, NVKM_SUBDEV_GPIO },

	{ 0x00200000, NVKM_SUBDEV_I2C },

	{ 0x00100000, NVKM_SUBDEV_TIMER },

	{ 0x00040000, NVKM_SUBDEV_THERM },

	{ 0x00002000, NVKM_SUBDEV_FB },

	{},

};



static const struct nvkm_mc_func

gp100_mc = {

	.init = nv50_mc_init,

	.intr = gk104_mc_intr,

	.intr = gp100_mc_intr,

	.intr_unarm = gp100_mc_intr_unarm,

	.intr_rearm = gp100_mc_intr_rearm,

	.intr_mask = gp100_mc_intr_mask,

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ gp10b_mc_init(struct nvkm_mc *mc) 
static const struct nvkm_mc_func

gp10b_mc = {

	.init = gp10b_mc_init,

	.intr = gk104_mc_intr,

	.intr = gp100_mc_intr,

	.intr_unarm = gp100_mc_intr_unarm,

	.intr_rearm = gp100_mc_intr_rearm,

	.intr_mask = gp100_mc_intr_mask,

drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h

+2 −0
Original line number Diff line number Diff line
@@ -57,4 +57,6 @@ int gp100_mc_new_(const struct nvkm_mc_func *, struct nvkm_device *, int, 


extern const struct nvkm_mc_map gk104_mc_intr[];

extern const struct nvkm_mc_map gk104_mc_reset[];



extern const struct nvkm_mc_map gp100_mc_intr[];

#endif