Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254263
b: refs/heads/master
c: 6002525
h: refs/heads/master
i:
  254261: 4052ab4
  254259: 7bab7f5
  254255: 4ee1a6f
v: v3
  • Loading branch information
Ben Skeggs authored and Dave Airlie committed Jul 1, 2011
1 parent 6c1ec5c commit 5352dd5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2498c41e1b6aaa1929d13cae9ff1cb6226887078
refs/heads/master: 6002525170df5f72c92ab946b6ebf1656aaec74d
2 changes: 0 additions & 2 deletions trunk/drivers/gpu/drm/nouveau/nouveau_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 5352dd5

Please sign in to comment.