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

Commit 6ebdb5a0 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use new atomic iterator macros in wm code 



The watermark code needs to look at the new allocations, so use
for_each_new_crtc_in_state everywhere.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489071125-917-4-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e96b206f

drivers/gpu/drm/i915/intel_pm.c

+4 −4
Original line number Diff line number Diff line
@@ -4120,7 +4120,7 @@ pipes_modified(struct drm_atomic_state *state) 
	struct drm_crtc_state *cstate;

	uint32_t i, ret = 0;



	for_each_crtc_in_state(state, crtc, cstate, i)

	for_each_new_crtc_in_state(state, crtc, cstate, i)

		ret |= drm_crtc_mask(crtc);



	return ret;
@@ -4263,7 +4263,7 @@ skl_print_wm_changes(const struct drm_atomic_state *state) 
	const struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb;

	int i;



	for_each_crtc_in_state(state, crtc, cstate, i) {

	for_each_new_crtc_in_state(state, crtc, cstate, i) {

		const struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

		enum pipe pipe = intel_crtc->pipe;
@@ -4305,7 +4305,7 @@ skl_compute_wm(struct drm_atomic_state *state) 
	 * since any racing commits that want to update them would need to

	 * hold _all_ CRTC state mutexes.

	 */

	for_each_crtc_in_state(state, crtc, cstate, i)

	for_each_new_crtc_in_state(state, crtc, cstate, i)

		changed = true;

	if (!changed)

		return 0;
@@ -4327,7 +4327,7 @@ skl_compute_wm(struct drm_atomic_state *state) 
	 * should allow skl_update_pipe_wm() to return failure in cases where

	 * no suitable watermark values can be found.

	 */

	for_each_crtc_in_state(state, crtc, cstate, i) {

	for_each_new_crtc_in_state(state, crtc, cstate, i) {

		struct intel_crtc_state *intel_cstate =

			to_intel_crtc_state(cstate);

		const struct skl_pipe_wm *old_pipe_wm =