diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-01 18:00:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-07-02 07:10:20 +1000 |
| commit | 6002525170df5f72c92ab946b6ebf1656aaec74d (patch) | |
| tree | 1f0c2e77d56972306070619335c6af268e74d7a1 | |
| parent | 2498c41e1b6aaa1929d13cae9ff1cb6226887078 (diff) | |
| download | blackbird-op-linux-6002525170df5f72c92ab946b6ebf1656aaec74d.tar.gz blackbird-op-linux-6002525170df5f72c92ab946b6ebf1656aaec74d.zip | |
Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"
Oh boy. That was a bad gamble. PDISP has changed.
This reverts commit cdf81a235f11c8a55023c6b181d21d519a8a5967.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 144f79a350ae..731acea865b5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -371,7 +371,6 @@ 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; @@ -923,7 +922,6 @@ 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: |
