[REBASED,v10,4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state

Commit Message

[e-mail] Aug. 10, 2016, 2:27 p.m. UTC

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: Lyude <[e-mail]>
Reviewed-by: Matt Roper <[e-mail]>
Cc: [e-mail]
Cc: Ville Syrjälä <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Radhakrishna Sripada <[e-mail]>
Cc: Hans de Goede <[e-mail]>
---
 drivers/gpu/drm/i915/intel_pm.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index df0fab6..165dc42 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4079,6 +4079,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;