drm/nv50/graph: remove ability to do interrupt-driven context switching
We never turn this on, no point maintaining the code for it.. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
5511d490da
commit
a226c32a38
|
@ -39,47 +39,6 @@ struct nv50_graph_engine {
|
||||||
u32 grctx_size;
|
u32 grctx_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int
|
|
||||||
nv50_graph_do_load_context(struct drm_device *dev, uint32_t inst)
|
|
||||||
{
|
|
||||||
uint32_t fifo = nv_rd32(dev, 0x400500);
|
|
||||||
|
|
||||||
nv_wr32(dev, 0x400500, fifo & ~1);
|
|
||||||
nv_wr32(dev, 0x400784, inst);
|
|
||||||
nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) | 0x40);
|
|
||||||
nv_wr32(dev, 0x400320, nv_rd32(dev, 0x400320) | 0x11);
|
|
||||||
nv_wr32(dev, 0x400040, 0xffffffff);
|
|
||||||
(void)nv_rd32(dev, 0x400040);
|
|
||||||
nv_wr32(dev, 0x400040, 0x00000000);
|
|
||||||
nv_wr32(dev, 0x400304, nv_rd32(dev, 0x400304) | 1);
|
|
||||||
|
|
||||||
if (nouveau_wait_for_idle(dev))
|
|
||||||
nv_wr32(dev, 0x40032c, inst | (1<<31));
|
|
||||||
nv_wr32(dev, 0x400500, fifo);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
nv50_graph_unload_context(struct drm_device *dev)
|
|
||||||
{
|
|
||||||
uint32_t inst;
|
|
||||||
|
|
||||||
inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_CUR);
|
|
||||||
if (!(inst & NV50_PGRAPH_CTXCTL_CUR_LOADED))
|
|
||||||
return 0;
|
|
||||||
inst &= NV50_PGRAPH_CTXCTL_CUR_INSTANCE;
|
|
||||||
|
|
||||||
nouveau_wait_for_idle(dev);
|
|
||||||
nv_wr32(dev, 0x400784, inst);
|
|
||||||
nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) | 0x20);
|
|
||||||
nv_wr32(dev, 0x400304, nv_rd32(dev, 0x400304) | 0x01);
|
|
||||||
nouveau_wait_for_idle(dev);
|
|
||||||
|
|
||||||
nv_wr32(dev, NV50_PGRAPH_CTXCTL_CUR, inst);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
nv50_graph_init(struct drm_device *dev, int engine)
|
nv50_graph_init(struct drm_device *dev, int engine)
|
||||||
{
|
{
|
||||||
|
@ -254,21 +213,6 @@ nv50_graph_object_new(struct nouveau_channel *chan, int engine,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
nv50_graph_context_switch(struct drm_device *dev)
|
|
||||||
{
|
|
||||||
uint32_t inst;
|
|
||||||
|
|
||||||
nv50_graph_unload_context(dev);
|
|
||||||
|
|
||||||
inst = nv_rd32(dev, NV50_PGRAPH_CTXCTL_NEXT);
|
|
||||||
inst &= NV50_PGRAPH_CTXCTL_NEXT_INSTANCE;
|
|
||||||
nv50_graph_do_load_context(dev, inst);
|
|
||||||
|
|
||||||
nv_wr32(dev, NV40_PGRAPH_INTR_EN, nv_rd32(dev,
|
|
||||||
NV40_PGRAPH_INTR_EN) | NV_PGRAPH_INTR_CONTEXT_SWITCH);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
nv50_graph_tlb_flush(struct drm_device *dev, int engine)
|
nv50_graph_tlb_flush(struct drm_device *dev, int engine)
|
||||||
{
|
{
|
||||||
|
@ -805,15 +749,6 @@ nv50_graph_isr(struct drm_device *dev)
|
||||||
show &= ~0x00000010;
|
show &= ~0x00000010;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat & 0x00001000) {
|
|
||||||
nv_wr32(dev, 0x400500, 0x00000000);
|
|
||||||
nv_wr32(dev, 0x400100, 0x00001000);
|
|
||||||
nv_mask(dev, 0x40013c, 0x00001000, 0x00000000);
|
|
||||||
nv50_graph_context_switch(dev);
|
|
||||||
stat &= ~0x00001000;
|
|
||||||
show &= ~0x00001000;
|
|
||||||
}
|
|
||||||
|
|
||||||
show = (show && nouveau_ratelimit()) ? show : 0;
|
show = (show && nouveau_ratelimit()) ? show : 0;
|
||||||
|
|
||||||
if (show & 0x00100000) {
|
if (show & 0x00100000) {
|
||||||
|
|
Loading…
Reference in New Issue