From patchwork Tue Aug 20 19:12:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104545 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56B6113B1 for ; Tue, 20 Aug 2019 19:12:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3EEE222DD3 for ; Tue, 20 Aug 2019 19:12:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EEE222DD3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 978B76E873; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750040.outbound.protection.outlook.com [40.107.75.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3EEF6E873; Tue, 20 Aug 2019 19:12:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mQZxA7UK7noKihKXuYdQ8e78vRVvB/IgYETThp49lhrfA1rDRzh2nR+HbqkRmlQNe7MH8gwz/SuKcChuX8Phyn7O3Q41TRiE3i+blzWIbAAv4qbyc9TJ/3xTPZ0K0+lGh0/mPXJWJKk/pZtJj0OfD/V9QRgPggJO2qCBi5B8zxE9+b6++8iP4CaKT0piEoRa3frqWevyxbTJWtrhuYBAWOtzwP277U8KxxQiQkox8jaUZJSCvVTFUr/ZvV9Mluce3Nf1WuWkfkk1paL3CtzlIU+lvoK3Q2DbPOFJHZGmoKo+FpJHccdJSRVF8k7QjFnmHL4+U8lckBx8j+r2G/HmoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mQrBmvdVpL7x5gTc0IXWqcmB61E5qzh1r5PUSj9kOJs=; b=nlwAKUUYvN83yrN0wlHIdfpTWA49T9sjx2X2u8kvz4vw48v3UOHWhz5bNo7SvThY/u5eqfs5IeKVFbyADTJuFq3CkRySPXRva6nhUFsuUZiqupNfOXlnDUgDZ1XTqAGO2OCGOBG6xG6Z59HEDwChDjbAUR8ulRO5bDa0CCrxeLkx6ovh4GsVflBM1Gyytt+rwT3uT83g4Ov24toe90+ejcJ6qKujopnQ2bvORlzxTu6pHbRBrcGTdDaSqLsDCvVXECHjZphRI657ATshfRTtH2NDs7FonN98Tnaro9sHOxIj00It9TzozWO+8kDzOcvN41yVUBXF8fSxEGgEQw1IXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by MWHPR12MB1533.namprd12.prod.outlook.com (2603:10b6:301:f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:31 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:31 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:31 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:28 -0500 From: David Francis To: , Subject: [PATCH v2 12/14] drm/amd/display: Write DSC enable to MST DPCD Date: Tue, 20 Aug 2019 15:12:01 -0400 Message-ID: <20190820191203.25807-13-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(4636009)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(189003)(199004)(6666004)(356004)(47776003)(8936002)(4326008)(50226002)(186003)(70206006)(14444005)(11346002)(49486002)(426003)(2616005)(446003)(486006)(86362001)(336012)(476003)(126002)(305945005)(36756003)(50466002)(2906002)(26005)(76176011)(16586007)(110136005)(70586007)(51416003)(54906003)(478600001)(450100002)(53936002)(5660300002)(81156014)(48376002)(1076003)(8676002)(316002)(81166006)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1533; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19072e1e-7d29-4c22-5e03-08d725a25986 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MWHPR12MB1533; X-MS-TrafficTypeDiagnostic: MWHPR12MB1533: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: LlgU+ERjuwFAhc/1eGvis0xJv+ztYMWrBqkzIG0lQ7rNkAbtDFA0j+i8ZOVm6/HcbCVbJ6aOJYfirLWZH+J3xxk8f6PnhOyyFX3M2p6C28pNyajtreHsW+9IhtrxAcQ77mTEVZoJ8LgFyytBVyvB7AFP52jV5zHnQARQ8ktCDKxGnzXq8btwsGJlFk9SjrC57M1SLSHChL2V9hYVUJBSkmn9sEia/Dm3SjtQ0Xxcn4Sdzmp48IK4cFRuHztFr7HJWL3RxieMLpziAY2nhAw/zmnfHrpJkZkCaABe+aOSW/O+oqxvj9YvVHI+0CsdIIfC8Ppsp0YlCXQMgndOKCd4CqsOsG79OARVcdXMmrebcTec7eBrnei37K2oLMFKhDgubPdhoe97eK2Z293yeW96XlRDr2BElHv0GIPyBBzXvsc= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:31.1471 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19072e1e-7d29-4c22-5e03-08d725a25986 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1533 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mQrBmvdVpL7x5gTc0IXWqcmB61E5qzh1r5PUSj9kOJs=; b=0SK7FapcfbmrDn1vtJ1kQ1pLnmKz31B2AtGh8XJIioVnF53FuBNyyJY0cdMcMXAJnmihU/cbLBwva4p8eNbKmGWN2gMkW7k826b50nao5dVvzU3hINDf+0PgSGQhbvPdtUx9Yzf3ZMQvJVUIRpHPU+SLgkArXl0gXMqVc3al3Xs= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis , Wenjing Liu , Nikola Cornij Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Rework the dm_helpers_write_dsc_enable callback to handle the MST case Depending on how DSC is done, the DP_DSC_ENABLE bit needs to be set on a different point For SST, use the link aux For endpoint DSC over DP-to-DP peer devices, use the output port For peer device DSC over DP-to-DP peer devices, use the upstream (peer) device For DP-to-HDMI or virtual DP peer devices, use the output port For the Synaptix workaround, use the link aux Cc: Wenjing Liu Cc: Nikola Cornij Signed-off-by: David Francis --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index dfa99e0d6e64..62731c2bf2bf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -38,6 +38,7 @@ #include "dc.h" #include "amdgpu_dm.h" #include "amdgpu_dm_irq.h" +#include "amdgpu_dm_mst_types.h" #include "dm_helpers.h" @@ -556,8 +557,35 @@ bool dm_helpers_dp_write_dsc_enable( ) { uint8_t enable_dsc = enable ? 1 : 0; + struct amdgpu_dm_connector *aconnector; + + if (!stream) + return false; + + if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + + if (!aconnector || !aconnector->dc_sink) + return false; + + if (!aconnector->dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc) + return drm_dp_mst_dpcd_write(&aconnector->port->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (is_virtual_dpcd(aconnector->port->parent->port_parent)) + return drm_dp_mst_dpcd_write(&aconnector->port->parent->port_parent->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (is_virtual_dpcd(aconnector->port)) + return drm_dp_mst_dpcd_write(&aconnector->port->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (synaptix_workaround(aconnector)) + return dm_helpers_dp_write_dpcd(ctx, stream->link, + DP_DSC_ENABLE, &enable_dsc, 1); + } + + if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT) + return dm_helpers_dp_write_dpcd(ctx, stream->link, DP_DSC_ENABLE, &enable_dsc, 1); - return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1); + return false; } #endif