Commit 18b54c4d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Fixes various potential oopses.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cdf81a23

drivers/gpu/drm/nouveau/nouveau_state.c

+56 −56
Original line number Diff line number Diff line
@@ -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);