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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 DE030C32750 for ; Fri, 2 Aug 2019 13:20:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B2CFB2173E for ; Fri, 2 Aug 2019 13:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752026; bh=Sczlfus0QhQynXrMg+oG23y9TvPE75FgQEDfjZAZOe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dT4amtP2t8LrDXaT6NYc0tI8TXumr+MR+pvhgkApoOhRb2wfMf5gLFm2HCjJAddLx G+eQUuzAgPd/+6p1qF4/ptnCcPai+DOpngWqCs3+r75bHo8e6FvWe/5CWUWncf2/SP wbBlmYrQUgznWuToCEo8nVypiE1fOemNIx6eyiaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393360AbfHBNUZ (ORCPT ); Fri, 2 Aug 2019 09:20:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:58518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393300AbfHBNUM (ORCPT ); Fri, 2 Aug 2019 09:20:12 -0400 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 374EF21850; Fri, 2 Aug 2019 13:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752011; bh=Sczlfus0QhQynXrMg+oG23y9TvPE75FgQEDfjZAZOe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZmgYkpcZp+BpZiojbdHHnZhhLbhWrdkaKdZtWU9vvNyjq6deYSYqkAU9oIt5jeZSz 3ZYdvlmkLGiKY0Tl20P+Vp9ETSUFQXzMkVFvLziLkR6EVGkB9JadJgcI5xUwgYV6gk s7+51srXmp7WBV3vtjwnGpZ9AmXHaDULMMT5LkDE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harmanprit Tatla , Aric Cyr , Anthony Koo , Leo Li , Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 16/76] drm/amd/display: No audio endpoint for Dell MST display Date: Fri, 2 Aug 2019 09:18:50 -0400 Message-Id: <20190802131951.11600-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-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: Harmanprit Tatla [ 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