From 5352dd5a2848d69c33ef53b2b86dd9aeef053b8b Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 1 Jul 2011 18:00:51 +1000 Subject: [PATCH] --- yaml --- r: 254263 b: refs/heads/master c: 6002525170df5f72c92ab946b6ebf1656aaec74d h: refs/heads/master i: 254261: 4052ab4156e5ba87a203e7ddd1a57b1828430c70 254259: 7bab7f51dd7a6afa059824c556faf946e4ee5df6 254255: 4ee1a6f859e243917302328c0179dd25dc6b0b73 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb53e4231792..205a8c3df09c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2498c41e1b6aaa1929d13cae9ff1cb6226887078 +refs/heads/master: 6002525170df5f72c92ab946b6ebf1656aaec74d diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c index 144f79a350ae..731acea865b5 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/trunk/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: