From e63d44cf76f24ba84abeef7e6ba70b5d65578202 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Tue, 1 Nov 2011 11:38:16 +0100 Subject: [PATCH] --- yaml --- r: 282620 b: refs/heads/master c: d4676461a75699ec0f6d271e3fe75ee631755c6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3fd16fc7f2dc..3a3812199034 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 091e40cd9529968bacbbb18fc05d6dea65421a5b +refs/heads/master: d4676461a75699ec0f6d271e3fe75ee631755c6e diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c index e7ff5acce65f..e025cae5ef23 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c @@ -295,7 +295,7 @@ read_clk(struct drm_device *dev, enum clk_src src) case 0x00000800: return read_clk(dev, clk_src_hclkm3d2) >> P; case 0x00000c00: - return read_pll(dev, clk_src_mclk) >> P; + return read_clk(dev, clk_src_mclk) >> P; } break; }