Commit 60025251 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie

Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"

Oh boy.  That was a bad gamble.  PDISP has changed.

This reverts commit cdf81a23.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2498c41e
...@@ -371,7 +371,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) ...@@ -371,7 +371,6 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
engine->vram.flags_valid = nv50_vram_flags_valid; engine->vram.flags_valid = nv50_vram_flags_valid;
break; break;
case 0xC0: case 0xC0:
case 0xD0:
engine->instmem.init = nvc0_instmem_init; engine->instmem.init = nvc0_instmem_init;
engine->instmem.takedown = nvc0_instmem_takedown; engine->instmem.takedown = nvc0_instmem_takedown;
engine->instmem.suspend = nvc0_instmem_suspend; engine->instmem.suspend = nvc0_instmem_suspend;
...@@ -923,7 +922,6 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) ...@@ -923,7 +922,6 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
dev_priv->card_type = NV_50; dev_priv->card_type = NV_50;
break; break;
case 0xc0: case 0xc0:
case 0xd0:
dev_priv->card_type = NV_C0; dev_priv->card_type = NV_C0;
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment