From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34830 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751516AbcIINmB (ORCPT ); Fri, 9 Sep 2016 09:42:01 -0400 Subject: Patch "[PATCH 078/135] drm/atomic: Do not unset crtc when an encoder is" has been added to the 4.4-stable tree To: maarten.lankhorst@linux.intel.com, alexander.levin@verizon.com, daniel.vetter@ffwll.ch, gregkh@linuxfoundation.org, gustavo.padovan@collabora.co.uk Cc: , From: Date: Fri, 09 Sep 2016 15:38:21 +0200 Message-ID: <1473428301694@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled [PATCH 078/135] drm/atomic: Do not unset crtc when an encoder is to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: 0078-drm-atomic-Do-not-unset-crtc-when-an-encoder-is-stol.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 328b8062af081141284186a4fb9bc37204f1dde2 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Thu, 7 Jan 2016 10:59:21 +0100 Subject: [PATCH 078/135] drm/atomic: Do not unset crtc when an encoder is stolen [ Upstream commit 97a8df90875f72ba3b4c3320759fd93cea743261 ] While we steal the encoder away from the connector the connector may be updated to use a different encoder. Without this change if 2 connectors swap encoders one of them will end up without a crtc. Signed-off-by: Maarten Lankhorst Reviewed-by: Gustavo Padovan Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/1452160762-30487-5-git-send-email-maarten.lankhorst@linux.intel.com Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_atomic_helper.c | 4 ---- 1 file changed, 4 deletions(-) --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -108,7 +108,6 @@ steal_encoder(struct drm_atomic_state *s struct drm_crtc_state *crtc_state; struct drm_connector *connector; struct drm_connector_state *connector_state; - int ret; /* * We can only steal an encoder coming from a connector, which means we @@ -139,9 +138,6 @@ steal_encoder(struct drm_atomic_state *s if (IS_ERR(connector_state)) return PTR_ERR(connector_state); - ret = drm_atomic_set_crtc_for_connector(connector_state, NULL); - if (ret) - return ret; connector_state->best_encoder = NULL; } Patches currently in stable-queue which might be from maarten.lankhorst@linux.intel.com are queue-4.4/0078-drm-atomic-Do-not-unset-crtc-when-an-encoder-is-stol.patch