From 6a45b01403db402f456a17fa6bb145a4ea34b23a Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Thu, 12 May 2011 22:40:47 +0200 Subject: [PATCH] --- yaml --- r: 260090 b: refs/heads/master c: 74cfad188b9e7e063ddb8d74fa20b38cbad10d79 h: refs/heads/master 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 891730e9e908..7e1558552f6f 100644 --- 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 index 144f79a350ae..dd6f30574a76 100644 --- 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);