drm/nouveau/fifo/gk104-: directly use new recovery code for ctxsw timeout (91b9d659) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+6 −24

Original line number	Original line	Diff line number	Diff line
	@@ -305,20 +305,6 @@ gk104_fifo_recover_engn(struct gk104_fifo *fifo, int engn)
	schedule_work(&fifo->recover.work);		schedule_work(&fifo->recover.work);
	}		}

	static void
	gk104_fifo_recover(struct gk104_fifo fifo, struct nvkm_engine engine,
	struct gk104_fifo_chan *chan)
	{
	int engn;
	for (engn = 0; engn < fifo->engine_nr; engn++) {
	if (fifo->engine[engn].engine == engine) {
	gk104_fifo_recover_engn(fifo, engn);
	break;
	}
	}
	gk104_fifo_recover_chan(&fifo->base, chan->base.chid);
	}

	static const struct nvkm_enum		static const struct nvkm_enum
	gk104_fifo_bind_reason[] = {		gk104_fifo_bind_reason[] = {
	{ 0x01, "BIND_NOT_UNBOUND" },		{ 0x01, "BIND_NOT_UNBOUND" },
	@@ -352,27 +338,23 @@ gk104_fifo_sched_reason[] = {
	static void		static void
	gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo)		gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo)
	{		{
	struct gk104_fifo_chan *chan;		unsigned long flags, engm = 0;
	unsigned long flags;
	u32 engn;		u32 engn;

	spin_lock_irqsave(&fifo->base.lock, flags);		spin_lock_irqsave(&fifo->base.lock, flags);
	for (engn = 0; engn < fifo->engine_nr; engn++) {		for (engn = 0; engn < fifo->engine_nr; engn++) {
	struct nvkm_engine *engine = fifo->engine[engn].engine;
	int runl = fifo->engine[engn].runl;
	struct gk104_fifo_engine_status status;		struct gk104_fifo_engine_status status;

	gk104_fifo_engine_status(fifo, engn, &status);		gk104_fifo_engine_status(fifo, engn, &status);
	if (!status.busy \|\| !status.chsw)		if (!status.busy \|\| !status.chsw)
	continue;		continue;

	list_for_each_entry(chan, &fifo->runlist[runl].chan, head) {		engm \|= BIT(engn);
	if (chan->base.chid == status.chan->id && engine) {
	gk104_fifo_recover(fifo, engine, chan);
	break;
	}
	}
	}		}

			for_each_set_bit(engn, &engm, fifo->engine_nr)
			gk104_fifo_recover_engn(fifo, engn);

	spin_unlock_irqrestore(&fifo->base.lock, flags);		spin_unlock_irqrestore(&fifo->base.lock, flags);
	}		}