---

yaml --- r: 260090 b: refs/heads/master c: 74cfad1 h: refs/heads/master v: v3
git-mirror · Jun 23, 2011 · 6a45b01 · 6a45b01
1 parent a3e2594
commit 6a45b01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 033b5650010652c069494df58424c4b98412fe3b
+refs/heads/master: 74cfad188b9e7e063ddb8d74fa20b38cbad10d79
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -415,6 +415,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
 		engine->vram.get		= nvc0_vram_new;
 		engine->vram.put		= nv50_vram_del;
 		engine->vram.flags_valid	= nvc0_vram_flags_valid;
+		engine->pm.temp_get		= nv84_temp_get;
 		break;
 	default:
 		NV_ERROR(dev, "NV%02x unsupported\n", dev_priv->chipset);