diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-11 03:18:13 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-11 03:18:13 +0100 |
commit | 0482e3c6f704d25b6a4e3c940caeeacece4e6d74 (patch) | |
tree | a8506b9b15ed9a31c2171fc7b461ef52453307b0 /drivers/gpu/drm/radeon/radeon_clocks.c | |
parent | Merge branch 'for_2.6.34_4f4e65_a' of git://git.pwsan.com/linux-2.6 into omap... (diff) | |
parent | OMAP: hsmmc: fix memory leak (diff) | |
download | linux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.tar.xz linux-0482e3c6f704d25b6a4e3c940caeeacece4e6d74.zip |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_clocks.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_clocks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index 812f24dbc2a8..73c4405bf42f 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c @@ -56,7 +56,7 @@ uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev) else if (post_div == 3) sclk >>= 2; else if (post_div == 4) - sclk >>= 4; + sclk >>= 3; return sclk; } @@ -86,7 +86,7 @@ uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev) else if (post_div == 3) mclk >>= 2; else if (post_div == 4) - mclk >>= 4; + mclk >>= 3; return mclk; } |