| From e0eb5c27f3837fb948ae280c8239cf8d2197d52a Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Fri, 11 Oct 2013 15:26:26 +0300 |
| Subject: drm/i915: Check 5/6 DDB split only when sprites are enabled |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Using the 5/6 DDB split make sense only when sprites are enabled. |
| So check that before we waste any cycles computing the merged |
| watermarks with the 5/6 DDB split. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit ec98c8d1ffdc87c54ec0896db45db5b7bd22eca9) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_pm.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c |
| index cdd78f69a28b..8064ff927bcc 100644 |
| --- a/drivers/gpu/drm/i915/intel_pm.c |
| +++ b/drivers/gpu/drm/i915/intel_pm.c |
| @@ -2931,7 +2931,8 @@ static void haswell_update_wm(struct drm_crtc *crtc) |
| ilk_wm_merge(dev, &max, &lp_wm_1_2); |
| |
| /* 5/6 split only in single pipe config on IVB+ */ |
| - if (INTEL_INFO(dev)->gen >= 7 && config.num_pipes_active == 1) { |
| + if (INTEL_INFO(dev)->gen >= 7 && |
| + config.num_pipes_active == 1 && config.sprites_enabled) { |
| ilk_compute_wm_maximums(dev, 1, &config, INTEL_DDB_PART_5_6, &max); |
| ilk_wm_merge(dev, &max, &lp_wm_5_6); |
| |
| -- |
| 1.8.5.rc3 |
| |
