From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EA19248878; Tue, 29 Apr 2025 17:12:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745946776; cv=none; b=FQF0YqKa9cNCfnRPv5RY/2oOGpWJTgysxkS3gJOohid6AIX0cxgs7Zlig0L7djoy1I9uZFw7UctsVjBMRKCfAVJScuieptrywG2ewUo8zGQ5WDn9ZAJzs7FufKPvdmHD/upnXINHYcoE4TEAJwXti7arcTC/Qgl7bDussjxcxmQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745946776; c=relaxed/simple; bh=IjJDTjDRbmC3EVZ3cvaiA3Ny5y9JfKAi8pHXz/4ctIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QjIyI30KKh4qDdcefKcbQtoMj9rRpdtxnahcPd3YLbYl8eULXmHFour4HV7ysKCYpwmOMrKPI+O+xvlCBvZooD8nODZr00/FemSD5+IOjZQaotM84KJJaNIRDCKaPkvDnNYq4jCSwslTUibGnHEI1aYyB0+zkppGxn7X2AFcXvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MTYg6kti; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MTYg6kti" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FB05C4CEE3; Tue, 29 Apr 2025 17:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745946774; bh=IjJDTjDRbmC3EVZ3cvaiA3Ny5y9JfKAi8pHXz/4ctIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MTYg6ktiCbzqSjd2622bJcYrNnannUNBip8vXP2OdJMvKRjHzMKFWsLL7qEYbXmvK XUD6ZTJWz8B2lBI8L5wKyEFNKlID5SrvfzfAUfY45T1EyYmAZe/C/ln6y6i9tyhqsM gCMMHLCMnewYHFokN0kaGqwi06WwzokmcfoSScPw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abhinav Kumar , Jessica Zhang , Maxime Ripard , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 5.10 036/286] drm: allow encoder mode_set even when connectors change for crtc Date: Tue, 29 Apr 2025 18:39:00 +0200 Message-ID: <20250429161109.346071664@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161107.848008295@linuxfoundation.org> References: <20250429161107.848008295@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abhinav Kumar [ Upstream commit 7e182cb4f5567f53417b762ec0d679f0b6f0039d ] In certain use-cases, a CRTC could switch between two encoders and because the mode being programmed on the CRTC remains the same during this switch, the CRTC's mode_changed remains false. In such cases, the encoder's mode_set also gets skipped. Skipping mode_set on the encoder for such cases could cause an issue because even though the same CRTC mode was being used, the encoder type could have changed like the CRTC could have switched from a real time encoder to a writeback encoder OR vice-versa. Allow encoder's mode_set to happen even when connectors changed on a CRTC and not just when the mode changed. Signed-off-by: Abhinav Kumar Signed-off-by: Jessica Zhang Reviewed-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20241211-abhinavk-modeset-fix-v3-1-0de4bf3e7c32@quicinc.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 0fde260b7edd8..dee3b81dec587 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1268,7 +1268,7 @@ 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 && !new_crtc_state->connectors_changed) continue; DRM_DEBUG_ATOMIC("modeset on [ENCODER:%d:%s]\n", -- 2.39.5