[PATCH] drm/nv50/pm: fix a typo in clock calculation

[PATCH] drm/nv50/pm: fix a typo in clock calculation

[Martin Peres]

Signed-off-by: Martin Peres <martin.peres-BktLLJ5BOkI@public.gmane.org>
---
 drivers/gpu/drm/nouveau/nv50_pm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index e7ff5ac..e025cae 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/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;
 		}
-- 
1.7.7.1

Re: [PATCH] drm/nv50/pm: fix a typo in clock calculation

[Martin Peres]

Le 01/11/2011 11:41, Martin Peres a écrit :
> Signed-off-by: Martin Peres<martin.peres-BktLLJ5BOkI@public.gmane.org>
> ---
>   drivers/gpu/drm/nouveau/nv50_pm.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
> index e7ff5ac..e025cae 100644
> --- a/drivers/gpu/drm/nouveau/nv50_pm.c
> +++ b/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;
>   		}
Ben: Up?