]> git.baikalelectronics.ru Git - kernel.git/commit
drm/nv50: avoid unloading pgraph context when ctxprog is running
authorMaarten Maathuis <madman2003@gmail.com>
Mon, 1 Feb 2010 17:32:09 +0000 (18:32 +0100)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 9 Feb 2010 22:19:36 +0000 (08:19 +1000)
commitf9b2e0b81dc84f2fdc9bd3f7fc9c08064489dcb7
treec3994c549c3d8349603083ee2cf96aebb5c47d44
parentadae796197e2514201eb140f3c83af0fe55a9960
drm/nv50: avoid unloading pgraph context when ctxprog is running

- We need to disable pgraph fifo access before checking the current channel,
  otherwise we could still hit a running ctxprog.
- The writes to 0x400500 are already handled by pgraph->fifo_access and are
  therefore redundant, moreover pgraph fifo access should not be reenabled
  before current context is set as invalid. So remove them altogether.

Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_channel.c
drivers/gpu/drm/nouveau/nv50_graph.c