From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934235AbcIFPMy (ORCPT ); Tue, 6 Sep 2016 11:12:54 -0400 Received: from foss.arm.com ([217.140.101.70]:54690 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933737AbcIFPMu (ORCPT ); Tue, 6 Sep 2016 11:12:50 -0400 From: Brian Starkey To: airlied@linux.ie Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Liviu.Dudau@arm.com Subject: [PATCH] drm/atomic: mode_set encoders when routing changes Date: Tue, 6 Sep 2016 16:12:36 +0100 Message-Id: <1473174756-14517-1-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org crtc_set_mode() only checks if the CRTC mode has changed when deciding whether encoders require a mode_set. This is insufficient when the CRTC mode isn't changed but a new encoder is added to it, leading to encoders never getting mode_set. Fix this by also checking that a connector's CRTC and encoder have not changed before skipping its encoder's mode_set. Signed-off-by: Brian Starkey --- drivers/gpu/drm/drm_atomic_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 20be86d..206fba1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -876,7 +876,9 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) mode = &new_crtc_state->mode; adjusted_mode = &new_crtc_state->adjusted_mode; - if (!new_crtc_state->mode_changed) + if (!new_crtc_state->mode_changed && + connector->state->crtc == old_conn_state->crtc && + connector->state->best_encoder == old_conn_state->best_encoder) continue; DRM_DEBUG_ATOMIC("modeset on [ENCODER:%d:%s]\n", -- 1.7.9.5