From 15d0289e6f125b791ac002a0c5ac7b1e4651dc03 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Sat, 22 Oct 2011 01:40:40 +0200 Subject: [PATCH] --- yaml --- r: 282595 b: refs/heads/master c: 6109183794a711d80c08705d477d2a19b437d5c1 h: refs/heads/master i: 282593: e9a05548a263b9e045b0b8f6c3da05e7d674e54e 282591: 770a13c44c55d57982f3c08be447b572cb44c10c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 91b32f9e62e9..374e86d4d2dd 100644 --- 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 index f3ee58283af0..31bca1dca85d 100644 --- 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;