Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 762c60ab authored by Lyude's avatar Lyude Committed by Jani Nikula
Browse files

drm/i915/skl: Ensure pipes with changed wms get added to the state 



If we're enabling a pipe, we'll need to modify the watermarks on all
active planes. Since those planes won't be added to the state on
their own, we need to add them ourselves.

Signed-off-by: default avatarLyude <cpaul@redhat.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Cc: stable@vger.kernel.org
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471463761-26796-6-git-send-email-cpaul@redhat.com


(cherry picked from commit 05a76d3d)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 9909113c

drivers/gpu/drm/i915/intel_pm.c

+4 −0
Original line number Diff line number Diff line
@@ -4104,6 +4104,10 @@ skl_compute_ddb(struct drm_atomic_state *state) 
		ret = skl_allocate_pipe_ddb(cstate, ddb);

		if (ret)

			return ret;



		ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);

		if (ret)

			return ret;

	}



	return 0;