diff options
| author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-05-09 14:37:11 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-19 16:39:44 -0400 |
| commit | 461bc9b587389586edf9315b337fb136f33594ad (patch) | |
| tree | 4d29d88481c0c10af0bcfb34c433b31298ca1b03 /drivers/gpu | |
| parent | a416edefbbaf942b588595ad6fa63ac700f5d73c (diff) | |
drm/i915: calculate watermarks for devices that have 3 pipes
This adds proper support for calculating those watermarks, checking for
number of available pipes instead of specific GPU variants when deciding
if watermarks for 3rd pipe are necessary.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 43892341079a..21587f89f44b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -1803,8 +1803,7 @@ static void sandybridge_update_wm(struct drm_device *dev) | |||
| 1803 | enabled |= 2; | 1803 | enabled |= 2; |
| 1804 | } | 1804 | } |
| 1805 | 1805 | ||
| 1806 | /* IVB has 3 pipes */ | 1806 | if ((dev_priv->num_pipe == 3) && |
| 1807 | if (IS_IVYBRIDGE(dev) && | ||
| 1808 | g4x_compute_wm0(dev, 2, | 1807 | g4x_compute_wm0(dev, 2, |
| 1809 | &sandybridge_display_wm_info, latency, | 1808 | &sandybridge_display_wm_info, latency, |
| 1810 | &sandybridge_cursor_wm_info, latency, | 1809 | &sandybridge_cursor_wm_info, latency, |