redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau: don't create accel engine objects when noaccel=1 

Fixes various potential oopses.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
hifive-unleashed-5.1
Ben Skeggs 2011-05-25 15:22:33 +10:00
parent cdf81a235f
commit 18b54c4d58
1 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_state.c
View File

@ -564,6 +564,7 @@ nouveau_card_init(struct drm_device *dev)
if (ret)
goto out_timer;
if (!nouveau_noaccel) {
switch (dev_priv->card_type) {
case NV_04:
nv04_graph_create(dev);
@ -625,7 +626,6 @@ nouveau_card_init(struct drm_device *dev)
(dev_priv->chipset < 0x98 || dev_priv->chipset == 0xa0))
nv50_mpeg_create(dev);
if (!nouveau_noaccel) {
for (e = 0; e < NVOBJ_ENGINE_NR; e++) {
if (dev_priv->eng[e]) {
ret = dev_priv->eng[e]->init(dev, e);