---

yaml --- r: 282595 b: refs/heads/master c: 6109183 h: refs/heads/master i: 282593: e9a0554 282591: 770a13c v: v3
git-mirror · Dec 21, 2011 · 15d0289 · 15d0289
1 parent 857d2fc
commit 15d0289
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: 1cb9469ee7bcdc0f80a3b12a1036352039ada72f
+refs/heads/master: 6109183794a711d80c08705d477d2a19b437d5c1
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -477,6 +477,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;
 		engine->pm.clocks_get		= nvc0_pm_clocks_get;
 		engine->pm.voltage_get		= nouveau_voltage_gpio_get;
 		engine->pm.voltage_set		= nouveau_voltage_gpio_set;