Commit 6997ea13 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: use split type+inst in device reset APIs 



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

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

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ struct nvkm_mc { 
	struct nvkm_subdev subdev;

};



void nvkm_mc_enable(struct nvkm_device *, enum nvkm_devidx);

void nvkm_mc_disable(struct nvkm_device *, enum nvkm_devidx);

bool nvkm_mc_enabled(struct nvkm_device *, enum nvkm_devidx);

void nvkm_mc_reset(struct nvkm_device *, enum nvkm_devidx);

void nvkm_mc_enable(struct nvkm_device *, enum nvkm_subdev_type, int);

void nvkm_mc_disable(struct nvkm_device *, enum nvkm_subdev_type, int);

bool nvkm_mc_enabled(struct nvkm_device *, enum nvkm_subdev_type, int);

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 *);

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct nvkm_top_device { 
};



u32 nvkm_top_addr(struct nvkm_device *, enum nvkm_devidx);

u32 nvkm_top_reset(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);

int nvkm_top_fault_id(struct nvkm_device *, enum nvkm_devidx);

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend) 
		}

	}



	nvkm_mc_reset(device, subdev->index);

	nvkm_mc_reset(device, subdev->type, subdev->inst);



	time = ktime_to_us(ktime_get()) - time;

	nvkm_trace(subdev, "%s completed in %lldus\n", action, time);

drivers/gpu/drm/nouveau/nvkm/engine/falcon.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend) 
		}

	}



	if (nvkm_mc_enabled(device, engine->subdev.index)) {

	if (nvkm_mc_enabled(device, engine->subdev.type, engine->subdev.inst)) {

		nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);

		nvkm_wr32(device, base + 0x014, 0xffffffff);

	}

drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ nvkm_fifo_oneinit(struct nvkm_engine *engine) 
static void

nvkm_fifo_preinit(struct nvkm_engine *engine)

{

	nvkm_mc_reset(engine->subdev.device, NVKM_ENGINE_FIFO);

	nvkm_mc_reset(engine->subdev.device, NVKM_ENGINE_FIFO, 0);

}



static int