android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/fifo/gk104: make use of topology info when handling ctxsw timeout

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-03-11 13:09:28 +10:00
parent 41e5171ba8
commit af83a67779
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
View File

@ -101,16 +101,6 @@ gk104_fifo_runlist_insert(struct gk104_fifo *fifo, struct gk104_fifo_chan *chan)
mutex_unlock(&fifo->base.engine.subdev.mutex); mutex_unlock(&fifo->base.engine.subdev.mutex);
} }
static inline struct nvkm_engine *
gk104_fifo_engine(struct gk104_fifo *fifo, u32 engn)
{
struct nvkm_device *device = fifo->base.engine.subdev.device;
u64 subdevs = gk104_fifo_engine_subdev(engn);
if (subdevs)
return nvkm_device_engine(device, __ffs(subdevs));
return NULL;
}
static void static void
gk104_fifo_recover_work(struct work_struct *w) gk104_fifo_recover_work(struct work_struct *w)
{ {
@ -196,13 +186,14 @@ static void
gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo) gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo)
{ {
struct nvkm_device *device = fifo->base.engine.subdev.device; struct nvkm_device *device = fifo->base.engine.subdev.device;
struct nvkm_engine *engine;
struct gk104_fifo_chan *chan; struct gk104_fifo_chan *chan;
unsigned long flags; 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;
u32 stat = nvkm_rd32(device, 0x002640 + (engn * 0x08)); u32 stat = nvkm_rd32(device, 0x002640 + (engn * 0x08));
u32 busy = (stat & 0x80000000); u32 busy = (stat & 0x80000000);
u32 next = (stat & 0x0fff0000) >> 16; u32 next = (stat & 0x0fff0000) >> 16;
@ -213,18 +204,16 @@ gk104_fifo_intr_sched_ctxsw(struct gk104_fifo *fifo)
u32 chid = load ? next : prev; u32 chid = load ? next : prev;
(void)save; (void)save;
if (busy && chsw) { if (!busy || !chsw)
list_for_each_entry(chan, &fifo->runlist[engn].chan, head) { continue;
if (chan->base.chid == chid) {
engine = gk104_fifo_engine(fifo, engn); list_for_each_entry(chan, &fifo->runlist[runl].chan, head) {
if (!engine) if (chan->base.chid == chid && engine) {
break;
gk104_fifo_recover(fifo, engine, chan); gk104_fifo_recover(fifo, engine, chan);
break; break;
} }
} }
} }
}
spin_unlock_irqrestore(&fifo->base.lock, flags); spin_unlock_irqrestore(&fifo->base.lock, flags);
} }