projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80dad86
)
drm/nv10: Don't oops if the card wants to switch to a channel with no grctx.
author
Francisco Jerez
<currojerez@riseup.net>
Tue, 21 Sep 2010 17:03:19 +0000
(19:03 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Fri, 24 Sep 2010 06:28:56 +0000
(16:28 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv10_graph.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv10_graph.c
b/drivers/gpu/drm/nouveau/nv10_graph.c
index
b2f6a57
..
8e68c97
100644
(file)
--- 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);