On Thu, Mar 09, 2017 at 03:52:03PM +0100, Maarten Lankhorst wrote:
> The watermark code needs to look at the new allocations, so use
> for_each_new_crtc_in_state everywhere.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 99e09f63d4b3..8670ef7707e7 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -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 =
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
