From 573062caae97ec219b3a2ea22086f4385843b83e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 9 Jun 2011 17:34:02 +1000 Subject: [PATCH] --- yaml --- r: 269591 b: refs/heads/master c: 3c71c2330b56ca4304b6cd0273ba861657a60a53 h: refs/heads/master i: 269589: 91286c3ea42a8b660c5ff1a2049b4240c69aa0ea 269587: cb682cc68481950fbb7682d122dc562994dc53d0 269583: 3499824d57e500139fe90513317f83f4bd15b419 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 b89430e908be..0a556cbdc91e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93dccbedeb2280ca2c234530236b950b232afa65 +refs/heads/master: 3c71c2330b56ca4304b6cd0273ba861657a60a53 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c index 10656e430b44..48bddd5b3503 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c @@ -422,6 +422,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->vram.put = nv50_vram_del; engine->vram.flags_valid = nvc0_vram_flags_valid; engine->pm.temp_get = nv84_temp_get; + engine->pm.voltage_get = nouveau_voltage_gpio_get; break; default: NV_ERROR(dev, "NV%02x unsupported\n", dev_priv->chipset);