Commit ec98c8d1 authored Oct 11, 2013 by Ville Syrjälä Committed by Daniel Vetter Oct 15, 2013

drm/i915: Check 5/6 DDB split only when sprites are enabled



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>

parent d9395655

drivers/gpu/drm/i915/intel_pm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);