On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote:
If we're enabling a pipe, we'll need to modify the watermarks on all other active pipes. Since those pipes won't be added to the state on their own, we need to add them ourselves.
All pipes (crtc's) are already added to the state if we have a change in active pipes. I think what you meant to write was "...we'll need to modify the watermarks on all active *planes*. Since those *planes* won't..."
Aside from the commit message, I believe the logic is correct, so you can consider this Reviewed-by: Matt Roper matthew.d.roper@intel.com once you reword it.
Matt
Signed-off-by: Lyude cpaul@redhat.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 Cc: Matt Roper matthew.d.roper@intel.com
drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 53adcbf..6b2452b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4085,6 +4085,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;
-- 2.7.4