diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-04 20:44:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-04 20:44:18 +0200 |
| commit | 3d90268f79d3be17914ebacd31f3ed69cea8eab1 (patch) | |
| tree | eb92f96305ced55d784b1e94efd73737ea1da843 | |
| parent | tmpfs: fix SEEK_DATA/SEEK_HOLE regression (diff) | |
| parent | drm/radeon: fix 64 bit divide in SI spm code (diff) | |
| download | linux-3d90268f79d3be17914ebacd31f3ed69cea8eab1.tar.xz linux-3d90268f79d3be17914ebacd31f3ed69cea8eab1.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fix from Dave Airlie:
"Just a quick fix that a few people have reported, be nice to have in
asap"
The drm tree seems to be very confused about 64-bit divides. Here it
uses a slow 64-by-64 bit divide to divide by a small constant. Oh well.
Doesn't look performance-critical, just stupid.
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: fix 64 bit divide in SI spm code
| -rw-r--r-- | drivers/gpu/drm/radeon/si_dpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 7ad22e87cd62..41825575b403 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -1767,7 +1767,7 @@ static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coe s64 temperature, t_slope, t_intercept, av, bv, t_ref; s64 tmp; - i_leakage = drm_int2fixp(ileakage) / 100; + i_leakage = div64_s64(drm_int2fixp(ileakage), 100); vddc = div64_s64(drm_int2fixp(v), 1000); temperature = div64_s64(drm_int2fixp(t), 1000); |