1 files changed, 58 insertions, 56 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 38ea662568c1..80218887e0a0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -371,6 +371,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->vram.flags_valid        = nv50_vram_flags_valid;
                break;
        case 0xC0:
+        case 0xD0:
                engine->instmem.init            = nvc0_instmem_init;
                engine->instmem.takedown        = nvc0_instmem_takedown;
                engine->instmem.suspend         = nvc0_instmem_suspend;
@@ -563,68 +564,68 @@ nouveau_card_init(struct drm_device *dev)
        if (ret)
                goto out_timer;
-        switch (dev_priv->card_type) {
+        if (!nouveau_noaccel) {
-        case NV_04:
+                switch (dev_priv->card_type) {
-                nv04_graph_create(dev);
+                case NV_04:
-                break;
+                        nv04_graph_create(dev);
-        case NV_10:
+                        break;
-                nv10_graph_create(dev);
+                case NV_10:
-                break;
+                        nv10_graph_create(dev);
-        case NV_20:
+                        break;
-        case NV_30:
+                case NV_20:
-                nv20_graph_create(dev);
+                case NV_30:
-                break;
+                        nv20_graph_create(dev);
-        case NV_40:
+                        break;
-                nv40_graph_create(dev);
+                case NV_40:
-                break;
+                        nv40_graph_create(dev);
-        case NV_50:
+                        break;
-                nv50_graph_create(dev);
+                case NV_50:
-                break;
+                        nv50_graph_create(dev);
-        case NV_C0:
+                        break;
-                nvc0_graph_create(dev);
+                case NV_C0:
-                break;
+                        nvc0_graph_create(dev);
-        default:
+                        break;
-                break;
+                default:
-        }
+                        break;
+                }
-        switch (dev_priv->chipset) {
-        case 0x84:
-        case 0x86:
-        case 0x92:
-        case 0x94:
-        case 0x96:
-        case 0xa0:
-                nv84_crypt_create(dev);
-                break;
-        }
-        switch (dev_priv->card_type) {
-        case NV_50:
                switch (dev_priv->chipset) {
-                case 0xa3:
+                case 0x84:
-                case 0xa5:
+                case 0x86:
-                case 0xa8:
+                case 0x92:
-                case 0xaf:
+                case 0x94:
-                        nva3_copy_create(dev);
+                case 0x96:
+                case 0xa0:
+                        nv84_crypt_create(dev);
                        break;
                }
-                break;
-        case NV_C0:
-                nvc0_copy_create(dev, 0);
-                nvc0_copy_create(dev, 1);
-                break;
-        default:
-                break;
-        }
-        if (dev_priv->card_type == NV_40)
+                switch (dev_priv->card_type) {
-                nv40_mpeg_create(dev);
+                case NV_50:
-        else
+                        switch (dev_priv->chipset) {
-        if (dev_priv->card_type == NV_50 &&
+                        case 0xa3:
-            (dev_priv->chipset < 0x98 || dev_priv->chipset == 0xa0))
+                        case 0xa5:
-                nv50_mpeg_create(dev);
+                        case 0xa8:
+                        case 0xaf:
+                                nva3_copy_create(dev);
+                                break;
+                        }
+                        break;
+                case NV_C0:
+                        nvc0_copy_create(dev, 0);
+                        nvc0_copy_create(dev, 1);
+                        break;
+                default:
+                        break;
+                }
+                if (dev_priv->card_type == NV_40)
+                        nv40_mpeg_create(dev);
+                else
+                if (dev_priv->card_type == NV_50 &&
+                    (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);
@@ -922,6 +923,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                dev_priv->card_type = NV_50;
                break;
        case 0xc0:
+        case 0xd0:
                dev_priv->card_type = NV_C0;
                break;
        default:

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 38ea662568c1..80218887e0a0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -371,6 +371,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
371	engine->vram.flags_valid = nv50_vram_flags_valid;	371	engine->vram.flags_valid = nv50_vram_flags_valid;
372	break;	372	break;
373	case 0xC0:	373	case 0xC0:
		374	case 0xD0:
374	engine->instmem.init = nvc0_instmem_init;	375	engine->instmem.init = nvc0_instmem_init;
375	engine->instmem.takedown = nvc0_instmem_takedown;	376	engine->instmem.takedown = nvc0_instmem_takedown;
376	engine->instmem.suspend = nvc0_instmem_suspend;	377	engine->instmem.suspend = nvc0_instmem_suspend;
@@ -563,68 +564,68 @@ nouveau_card_init(struct drm_device *dev)
563	if (ret)	564	if (ret)
564	goto out_timer;	565	goto out_timer;
565		566
566	switch (dev_priv->card_type) {	567	if (!nouveau_noaccel) {
567	case NV_04:	568	switch (dev_priv->card_type) {
568	nv04_graph_create(dev);	569	case NV_04:
569	break;	570	nv04_graph_create(dev);
570	case NV_10:	571	break;
571	nv10_graph_create(dev);	572	case NV_10:
572	break;	573	nv10_graph_create(dev);
573	case NV_20:	574	break;
574	case NV_30:	575	case NV_20:
575	nv20_graph_create(dev);	576	case NV_30:
576	break;	577	nv20_graph_create(dev);
577	case NV_40:	578	break;
578	nv40_graph_create(dev);	579	case NV_40:
579	break;	580	nv40_graph_create(dev);
580	case NV_50:	581	break;
581	nv50_graph_create(dev);	582	case NV_50:
582	break;	583	nv50_graph_create(dev);
583	case NV_C0:	584	break;
584	nvc0_graph_create(dev);	585	case NV_C0:
585	break;	586	nvc0_graph_create(dev);
586	default:	587	break;
587	break;	588	default:
588	}	589	break;
589		590	}
590	switch (dev_priv->chipset) {
591	case 0x84:
592	case 0x86:
593	case 0x92:
594	case 0x94:
595	case 0x96:
596	case 0xa0:
597	nv84_crypt_create(dev);
598	break;
599	}
600		591
601	switch (dev_priv->card_type) {
602	case NV_50:
603	switch (dev_priv->chipset) {	592	switch (dev_priv->chipset) {
604	case 0xa3:	593	case 0x84:
605	case 0xa5:	594	case 0x86:
606	case 0xa8:	595	case 0x92:
607	case 0xaf:	596	case 0x94:
608	nva3_copy_create(dev);	597	case 0x96:
		598	case 0xa0:
		599	nv84_crypt_create(dev);
609	break;	600	break;
610	}	601	}
611	break;
612	case NV_C0:
613	nvc0_copy_create(dev, 0);
614	nvc0_copy_create(dev, 1);
615	break;
616	default:
617	break;
618	}
619		602
620	if (dev_priv->card_type == NV_40)	603	switch (dev_priv->card_type) {
621	nv40_mpeg_create(dev);	604	case NV_50:
622	else	605	switch (dev_priv->chipset) {
623	if (dev_priv->card_type == NV_50 &&	606	case 0xa3:
624	(dev_priv->chipset < 0x98 \|\| dev_priv->chipset == 0xa0))	607	case 0xa5:
625	nv50_mpeg_create(dev);	608	case 0xa8:
		609	case 0xaf:
		610	nva3_copy_create(dev);
		611	break;
		612	}
		613	break;
		614	case NV_C0:
		615	nvc0_copy_create(dev, 0);
		616	nvc0_copy_create(dev, 1);
		617	break;
		618	default:
		619	break;
		620	}
		621
		622	if (dev_priv->card_type == NV_40)
		623	nv40_mpeg_create(dev);
		624	else
		625	if (dev_priv->card_type == NV_50 &&
		626	(dev_priv->chipset < 0x98 \|\| dev_priv->chipset == 0xa0))
		627	nv50_mpeg_create(dev);
626		628
627	if (!nouveau_noaccel) {
628	for (e = 0; e < NVOBJ_ENGINE_NR; e++) {	629	for (e = 0; e < NVOBJ_ENGINE_NR; e++) {
629	if (dev_priv->eng[e]) {	630	if (dev_priv->eng[e]) {
630	ret = dev_priv->eng[e]->init(dev, e);	631	ret = dev_priv->eng[e]->init(dev, e);
@@ -922,6 +923,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
922	dev_priv->card_type = NV_50;	923	dev_priv->card_type = NV_50;
923	break;	924	break;
924	case 0xc0:	925	case 0xc0:
		926	case 0xd0:
925	dev_priv->card_type = NV_C0;	927	dev_priv->card_type = NV_C0;
926	break;	928	break;
927	default:	929	default: