Commit a35047ba authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: use split type+inst in interrupt masking API 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 6997ea13

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ void nvkm_mc_reset(struct nvkm_device *, enum nvkm_subdev_type, int); 
void nvkm_mc_intr(struct nvkm_device *, bool *handled);

void nvkm_mc_intr_unarm(struct nvkm_device *);

void nvkm_mc_intr_rearm(struct nvkm_device *);

void nvkm_mc_intr_mask(struct nvkm_device *, enum nvkm_devidx, bool enable);

void nvkm_mc_intr_mask(struct nvkm_device *, enum nvkm_subdev_type, int, bool enable);

void nvkm_mc_unk260(struct nvkm_device *, u32 data);



int nv04_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct nvkm_top_device { 
u32 nvkm_top_addr(struct nvkm_device *, enum nvkm_devidx);

u32 nvkm_top_reset(struct nvkm_device *, enum nvkm_subdev_type, int);

u32 nvkm_top_intr(struct nvkm_device *, u32 intr, u64 *subdevs);

u32 nvkm_top_intr_mask(struct nvkm_device *, enum nvkm_devidx);

u32 nvkm_top_intr_mask(struct nvkm_device *, enum nvkm_subdev_type, int);

int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_devidx);

enum nvkm_devidx nvkm_top_fault(struct nvkm_device *, int fault);

enum nvkm_devidx nvkm_top_engine(struct nvkm_device *, int, int *runl, int *engn);

drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ gm200_acr_hsfw_boot(struct nvkm_acr *acr, struct nvkm_acr_hsf *hsf, 
	hsf->func->bld(acr, hsf);



	/* Boot the falcon. */

	nvkm_mc_intr_mask(device, falcon->owner->index, false);

	nvkm_mc_intr_mask(device, falcon->owner->type, falcon->owner->inst, false);



	nvkm_falcon_wr32(falcon, 0x040, 0xdeada5a5);

	nvkm_falcon_set_start_addr(falcon, hsf->imem_tag << 8);
@@ -279,7 +279,7 @@ gm200_acr_hsfw_boot(struct nvkm_acr *acr, struct nvkm_acr_hsf *hsf, 
		return -EIO;



	nvkm_falcon_clear_interrupt(falcon, intr_clear);

	nvkm_mc_intr_mask(device, falcon->owner->index, true);

	nvkm_mc_intr_mask(device, falcon->owner->type, falcon->owner->inst, true);

	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void 
gp100_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable)

{

	struct nvkm_device *device = buffer->fault->subdev.device;

	nvkm_mc_intr_mask(device, NVKM_SUBDEV_FAULT, enable);

	nvkm_mc_intr_mask(device, NVKM_SUBDEV_FAULT, 0, enable);

}



void

drivers/gpu/drm/nouveau/nvkm/subdev/fault/tu102.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ tu102_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable) 
	 */

	struct nvkm_device *device = buffer->fault->subdev.device;



	nvkm_mc_intr_mask(device, NVKM_SUBDEV_FAULT, enable);

	nvkm_mc_intr_mask(device, NVKM_SUBDEV_FAULT, 0, enable);

}



static void