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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 11FE4C433FF for ; Wed, 14 Aug 2019 17:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEDEA20665 for ; Wed, 14 Aug 2019 17:25:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803524; bh=8kiy6x9kOZIqvbwQZ1qz134zUL+JWlXhCP6Bpj+x82Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zw9ghHe4DolhF6wFTutJ7BFULn5CmxJeBSSW+BoMYKMOHKsMOeFkt42AKhQ0uWELq 1D4ksQWPPGCxy/TXhAIzOaUVJcCa9v4IpH4g+By5SDOPSThWfWpaqbS02gop6LvoeY fLhMrbFXqoIlqCW1KN1LeM+g7/5+rnm1tSsQyaNU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729029AbfHNRFw (ORCPT ); Wed, 14 Aug 2019 13:05:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:54834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729527AbfHNRFv (ORCPT ); Wed, 14 Aug 2019 13:05:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4193D21721; Wed, 14 Aug 2019 17:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802350; bh=8kiy6x9kOZIqvbwQZ1qz134zUL+JWlXhCP6Bpj+x82Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2dvUVKnblmx60lDgD+yqxh9R+OPQFNSW5rOJg6s3i0RIKPfU2aFu9/JwIa8QKeK6 cxESfvE//hTLFMDax8sZgFoY6s6widu+O0CPBK62oTaCd7B25CLwduZsFC9kOkNjqt 9C9lmLz37jfoef8yOaJynukdfMtz7C32QSF8BUUo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harmanprit Tatla , Aric Cyr , Anthony Koo , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.2 064/144] drm/amd/display: No audio endpoint for Dell MST display Date: Wed, 14 Aug 2019 19:00:20 +0200 Message-Id: <20190814165802.514981594@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 5b25e5f1a97284020abee7348427f89abdb674e8 ] [Why] There are certain MST displays (i.e. Dell P2715Q) that although have the MST feature set to off may still report it is a branch device and a non-zero value for downstream port present. This can lead to us incorrectly classifying a dp dongle connection as being active and disabling the audio endpoint for the display. [How] Modified the placement and condition used to assign the is_branch_dev bit. Signed-off-by: Harmanprit Tatla Reviewed-by: Aric Cyr Acked-by: Anthony Koo Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c index 253311864cdd5..966aa3b754c5b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c @@ -2218,11 +2218,18 @@ static void get_active_converter_info( link->dpcd_caps.dongle_type = DISPLAY_DONGLE_NONE; ddc_service_set_dongle_type(link->ddc, link->dpcd_caps.dongle_type); + link->dpcd_caps.is_branch_dev = false; return; } /* DPCD 0x5 bit 0 = 1, it indicate it's branch device */ - link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT; + if (ds_port.fields.PORT_TYPE == DOWNSTREAM_DP) { + link->dpcd_caps.is_branch_dev = false; + } + + else { + link->dpcd_caps.is_branch_dev = ds_port.fields.PORT_PRESENT; + } switch (ds_port.fields.PORT_TYPE) { case DOWNSTREAM_VGA: -- 2.20.1