drm/nouveau: don't create accel engine objects when noaccel=1
Fixes various potential oopses. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
cdf81a235f
commit
18b54c4d58
|
@ -564,6 +564,7 @@ nouveau_card_init(struct drm_device *dev)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_timer;
|
goto out_timer;
|
||||||
|
|
||||||
|
if (!nouveau_noaccel) {
|
||||||
switch (dev_priv->card_type) {
|
switch (dev_priv->card_type) {
|
||||||
case NV_04:
|
case NV_04:
|
||||||
nv04_graph_create(dev);
|
nv04_graph_create(dev);
|
||||||
|
@ -625,7 +626,6 @@ nouveau_card_init(struct drm_device *dev)
|
||||||
(dev_priv->chipset < 0x98 || dev_priv->chipset == 0xa0))
|
(dev_priv->chipset < 0x98 || dev_priv->chipset == 0xa0))
|
||||||
nv50_mpeg_create(dev);
|
nv50_mpeg_create(dev);
|
||||||
|
|
||||||
if (!nouveau_noaccel) {
|
|
||||||
for (e = 0; e < NVOBJ_ENGINE_NR; e++) {
|
for (e = 0; e < NVOBJ_ENGINE_NR; e++) {
|
||||||
if (dev_priv->eng[e]) {
|
if (dev_priv->eng[e]) {
|
||||||
ret = dev_priv->eng[e]->init(dev, e);
|
ret = dev_priv->eng[e]->init(dev, e);
|
||||||
|
|
Loading…
Reference in a new issue