diff options
| author | Tom O'Rourke <Tom.O'[email protected]> | 2015-02-10 23:06:46 -0800 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2015-02-11 14:09:51 +0200 |
| commit | 46efa4abe5712276494adbce102f46e3214632fd (patch) | |
| tree | a84284678d162e82b33327e94e8d27c7c1f10431 | |
| parent | a8b3d52f8bc24b1c1bf7711bcf3e21fe0aaa752c (diff) | |
drm/i915: Clamp efficient frequency to valid range
The efficient frequency (RPe) should stay in the range
RPn <= RPe <= RP0. The pcode clamps the returned value
internally on Broadwell but not on Haswell.
Fix for missing range check in
commit 93ee29203f506582cca2bcec5f05041526d9ab0a
Author: Tom O'Rourke <Tom.O'[email protected]>
Date: Wed Nov 19 14:21:52 2014 -0800
drm/i915: Use efficient frequency for HSW/BDW
Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-February/059802.html
Reported-by: Michael Auchter <[email protected]>
Suggested-by: Chris Wilson <[email protected]>
Cc: [email protected] # v3.19
Signed-off-by: Tom O'Rourke <Tom.O'[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 6ece663f3394..24d77ddcc5f4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4005,7 +4005,10 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) &ddcc_status); if (0 == ret) dev_priv->rps.efficient_freq = - (ddcc_status >> 8) & 0xff; + clamp_t(u8, + ((ddcc_status >> 8) & 0xff), + dev_priv->rps.min_freq, + dev_priv->rps.max_freq); } /* Preserve min/max settings in case of re-init */ |