From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D87EC43603 for ; Tue, 10 Dec 2019 21:27:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54C06207FF for ; Tue, 10 Dec 2019 21:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013233; bh=/SVe0pXGAgiWiU2Aj/V5oelee8zM1PXTQwlxRsZFXfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NCvnqWT+kxlydzNaWxRF7qPklx2fKTySCdo8Lf39dvCZ0ztvyLVXb3z+XqQKjI+6O cMn1r9WMph0WzGXSnKfmA0bWD7KRRbQ8GlRjpFiBONgbf2tR7QvTI9D83P+pzo4dKt 1Fu0alEaPiLU/RKt7GMgtkeiVje6C0e/4xqd0yfY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727295AbfLJV1L (ORCPT ); Tue, 10 Dec 2019 16:27:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:56452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729383AbfLJVZ2 (ORCPT ); Tue, 10 Dec 2019 16:25:28 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1647B20838; Tue, 10 Dec 2019 21:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013128; bh=/SVe0pXGAgiWiU2Aj/V5oelee8zM1PXTQwlxRsZFXfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=faz4JOax0bCt5FUiU9HVE5JPH/jOAo6gysdzyZBmcZfmXIf0icq9dAjLqmPUoOhPC hdZq7/vVBxSwAD+dOj6/WeoA6RH8GSvJMm9NLNAzcu+3Tm4qfEl0pL2uSR7y9waD8N cOjE1qCk53JbqJ+axlZUpc9tIWTjQsuG5lTnUjiY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Tsai , Charlene Liu , Leo Li , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.3 013/292] drm/amd/display: Handle virtual signal type in disable_link() Date: Tue, 10 Dec 2019 16:20:32 -0500 Message-Id: <20191210212511.11392-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210212511.11392-1-sashal@kernel.org> References: <20191210212511.11392-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Tsai [ Upstream commit 616f5b65f1c02d3d6ae370644670d14c57de2fd8 ] [Why] The new implementation changed the behavior to allow process setMode to DAL when DAL returns empty mode query for unplugged display. This will trigger additional disable_link(). When unplug HDMI from MST dock, driver will update stream->signal to "Virtual". disable_link() will call disable_output() if the signal type is not DP and induce other displays on MST dock show black screen. [How] Don't need to process disable_output() if the signal type is virtual. Signed-off-by: Martin Tsai Reviewed-by: Charlene Liu Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 355b4ba127966..90217cf83ce17 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -2157,8 +2157,10 @@ static void disable_link(struct dc_link *link, enum signal_type signal) dp_set_fec_ready(link, false); } #endif - } else - link->link_enc->funcs->disable_output(link->link_enc, signal); + } else { + if (signal != SIGNAL_TYPE_VIRTUAL) + link->link_enc->funcs->disable_output(link->link_enc, signal); + } if (signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { /* MST disable link only when no stream use the link */ -- 2.20.1