diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-09-21 19:03:19 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:28:56 +1000 |
| commit | bb338bb6f230aa70e70dc0d27af1b7a8efc34cdd (patch) | |
| tree | c5468b12c1fbb294d488d9ebf1a53bf4d11655ca | |
| parent | 80dad869a3bc30b4e6c3ae527f94abbe9bb497f5 (diff) | |
| download | talos-op-linux-bb338bb6f230aa70e70dc0d27af1b7a8efc34cdd.tar.gz talos-op-linux-bb338bb6f230aa70e70dc0d27af1b7a8efc34cdd.zip | |
drm/nv10: Don't oops if the card wants to switch to a channel with no grctx.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv10_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c index b2f6a57c0cc5..8e68c9731159 100644 --- a/drivers/gpu/drm/nouveau/nv10_graph.c +++ b/drivers/gpu/drm/nouveau/nv10_graph.c @@ -803,7 +803,7 @@ nv10_graph_context_switch(struct drm_device *dev) /* Load context for next channel */ chid = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 20) & 0x1f; chan = dev_priv->fifos[chid]; - if (chan) + if (chan && chan->pgraph_ctx) nv10_graph_load_context(chan); pgraph->fifo_access(dev, true); |
