Commit fe392efd authored Mar 07, 2014 by Ville Syrjälä Committed by Daniel Vetter Apr 09, 2014

drm/i915: Skip watermark merging for inactive pipes



Even though the inactive pipes should have their watermarks set to all 0
with enable=true, we can possibly shave off a few cycles by completely
skipping the merge procedure for inactive pipes.

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 2a44b76b

drivers/gpu/drm/i915/intel_pm.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -2206,8 +2206,11 @@ static void ilk_merge_wm_level(struct drm_device *dev,
		const struct intel_crtc *intel_crtc;

		list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) {
		const struct intel_wm_level *wm =
		&intel_crtc->wm.active.wm[level];
		const struct intel_pipe_wm *active = &intel_crtc->wm.active;
		const struct intel_wm_level *wm = &active->wm[level];

		if (!active->pipe_enabled)
		continue;

		if (!wm->enable)
		return;