From patchwork Tue Aug 27 14:13:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117063 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 9FC7B112C for ; Tue, 27 Aug 2019 14:13:37 +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 870E92173E for ; Tue, 27 Aug 2019 14:13:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 870E92173E 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 5503E8902B; Tue, 27 Aug 2019 14:13:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-BY2-obe.outbound.protection.outlook.com (mail-by2nam05on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe52::62c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7EAB78902B; Tue, 27 Aug 2019 14:13:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lYc2Mvkl7KjL8lyaHo5UW+lZIBxST3+loSR4RE6xqeEtwf8DaJJqNUVWipT588rj+agQ3n07u3fxM9k6yXm4gDGvXBRqRsKmvhBPPK2DU+5QXTXZF1DSfpV8AVDJN1IZ7Gci7c1SVq2W0Xp4PywPopJpACFyeZMrh1xgXwEUobu3/BXI27Xl3CKIS+dSsNTSSGIRkW49aRDOBpOGGXN5OvQIQrdA91VVOcnbo5vtLIG3o+gRqJu5knpwFUX6swpAytGNsPZ8keBOpvPfRKMEPWEYjp8BadPknITaIj8zLq/01X861sLD1prxoT5ThpY0mdKVMGCgHRDJGPcSBAgCsA== 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=FsVvmbVRtGqMzH2hisFDmk3OUGGWsXqdMtGVyaaGroc=; b=FfnzfCuTZUEpGwVXYX4cWnoGMlnzQWSncNvoHBs/JPOjJDfyNfbNiOTHnSJbYjhpoeOC3tOSZe5FA2VJZtaxaUDX0IbiD5XSzmlPF5cMx0L9aWxMM38FBU55m7+qWHxNpTD3XPRZtnNbL9UqxmgA8X9Vbumlr/aYXjzMqzda687sJwLDJMuGj4xPx09Ck3A7/J9mtBz98jA9hBtXV3m009Jzt6FHUJsoJpq8VA4gKRq1ktROUP8N3ysvaWKZ6FV51oI+8o0ljX/ji/+HLsKlpPfuvwJH82ul8BXG20UtvWngZiA0mYSAE3GWkwtuhNnyNmRhXt2FkHJpm3EreG8zcQ== 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 BN6PR1201CA0005.namprd12.prod.outlook.com (2603:10b6:405:4c::15) by BYAPR12MB2712.namprd12.prod.outlook.com (2603:10b6:a03:68::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Tue, 27 Aug 2019 14:13:33 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::205) by BN6PR1201CA0005.outlook.office365.com (2603:10b6:405:4c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.17 via Frontend Transport; Tue, 27 Aug 2019 14:13:32 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:32 +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, 27 Aug 2019 09:13:31 -0500 From: David Francis To: Subject: [PATCH v9 1/6] drm/dp_mst: Add PBN calculation for DSC modes Date: Tue, 27 Aug 2019 10:13:24 -0400 Message-ID: <20190827141329.30767-2-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(376002)(396003)(39860400002)(346002)(136003)(2980300002)(428003)(189003)(199004)(26005)(51416003)(76176011)(186003)(6916009)(478600001)(70586007)(450100002)(2351001)(70206006)(81166006)(81156014)(8676002)(305945005)(50226002)(8936002)(48376002)(16586007)(54906003)(316002)(1076003)(4326008)(126002)(2906002)(476003)(50466002)(486006)(11346002)(336012)(446003)(49486002)(2616005)(356004)(426003)(36756003)(86362001)(6666004)(53936002)(47776003)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2712; 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: ab406a33-7c3d-4584-ef44-08d72af8be05 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:BYAPR12MB2712; X-MS-TrafficTypeDiagnostic: BYAPR12MB2712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: lWpabPyiR2GbVDnvg1T6vV2+5ZM8/mq2MFw588BPe0nw0kYPniqttNsobbw537ojZk/3vQr+t8FiFrp7hRYeFSpMEy449dXztSw0wqA79f5MszlZYBV1y04uNaRglp9Jw89l/nwvVtINjmocejaX01BQ9FSuPLDHfTd+Z8r/2Mmm605ZkjlFjRv2ZNahp7R8I3X7D7CdBxqCkw0t4Z23lMSdg/Phvtt35c139BBDNyl94zPuZ100SwBpL5iRaVkIR9BMQy237PnOuMjphU0QMifbP8tkZhQSsh9C/s4jQv3XbgKXzYJnOj4IMIdm1g+nMmYsSaw4Gpjpr2GmkH0yGfmS2l+cgtiY0A1LsJzwbzNsfvBvXsqLDggTtotZ8aWpaxmw++8Vv3lw0MLtJ+q/usUW861uxi8yk1nOY/wSQmk= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:32.2318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab406a33-7c3d-4584-ef44-08d72af8be05 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: BYAPR12MB2712 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=FsVvmbVRtGqMzH2hisFDmk3OUGGWsXqdMtGVyaaGroc=; b=Dk2VxVsxx5+qE1BWAmQj0Gw4NCWxT6VAdhopLJNq3xboIpLNpiQ3xmloAgD12TScRCtO/R6SMhplGhzrc2WksQ5vrPLFT7Sao+8GGBsliktrVTiWtSIiG8AU9KzkM87jP7xnqx802GJkqV21GwlFh0h/Fn6nZ2/l5u0XaqnjytE= 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: nouveau@lists.freedesktop.org, David Francis , intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With DSC, bpp can be fractional in multiples of 1/16. Change drm_dp_calc_pbn_mode to reflect this, adding a new parameter bool dsc. When this parameter is true, treat the bpp parameter as having units not of bits per pixel, but 1/16 of a bit per pixel v2: Don't add separate function for this Cc: amd-gfx@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Manasi Navare Reviewed-by: Lyude Paul Reviewed-by: Harry Wentland Signed-off-by: David Francis --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 16 ++++++++++++---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- include/drm/drm_dp_mst_helper.h | 3 +-- 6 files changed, 17 insertions(+), 10 deletions(-) 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 a0ed0154a9f0..abafb5221b44 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 @@ -235,7 +235,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( /* TODO need to know link rate */ - pbn = drm_dp_calc_pbn_mode(clock, bpp); + pbn = drm_dp_calc_pbn_mode(clock, bpp, false); slots = drm_dp_find_vcpi_slots(mst_mgr, pbn); ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots); diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 82add736e17d..3e7b7553cf4d 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3534,10 +3534,11 @@ EXPORT_SYMBOL(drm_dp_check_act_status); * drm_dp_calc_pbn_mode() - Calculate the PBN for a mode. * @clock: dot clock for the mode * @bpp: bpp for the mode. + * @dsc: DSC mode. If true, bpp has units of 1/16 of a bit per pixel * * This uses the formula in the spec to calculate the PBN value for a mode. */ -int drm_dp_calc_pbn_mode(int clock, int bpp) +int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc) { u64 kbps; s64 peak_kbps; @@ -3555,11 +3556,18 @@ int drm_dp_calc_pbn_mode(int clock, int bpp) * peak_kbps *= (1006/1000) * peak_kbps *= (64/54) * peak_kbps *= 8 convert to bytes + * + * If the bpp is in units of 1/16, further divide by 16. Put this + * factor in the numerator rather than the denominator to avoid + * integer overflow */ numerator = 64 * 1006; denominator = 54 * 8 * 1000 * 1000; + if (dsc) + numerator /= 16; + kbps *= numerator; peak_kbps = drm_fixp_from_fraction(kbps, denominator); @@ -3570,19 +3578,19 @@ EXPORT_SYMBOL(drm_dp_calc_pbn_mode); static int test_calc_pbn_mode(void) { int ret; - ret = drm_dp_calc_pbn_mode(154000, 30); + ret = drm_dp_calc_pbn_mode(154000, 30, false); if (ret != 689) { DRM_ERROR("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n", 154000, 30, 689, ret); return -EINVAL; } - ret = drm_dp_calc_pbn_mode(234000, 30); + ret = drm_dp_calc_pbn_mode(234000, 30, false); if (ret != 1047) { DRM_ERROR("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n", 234000, 30, 1047, ret); return -EINVAL; } - ret = drm_dp_calc_pbn_mode(297000, 24); + ret = drm_dp_calc_pbn_mode(297000, 24, false); if (ret != 1063) { DRM_ERROR("PBN calculation test failed - clock %d, bpp %d, expected PBN %d, actual PBN %d.\n", 297000, 24, 1063, ret); diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 2c5ac3dd647f..4f17f61f4453 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -61,7 +61,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, crtc_state->pipe_bpp = bpp; crtc_state->pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, - crtc_state->pipe_bpp); + crtc_state->pipe_bpp, false); slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, port, crtc_state->pbn); diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 5c36c75232e6..c68783c1f3fa 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -782,7 +782,7 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, const int bpp = connector->display_info.bpc * 3; const int clock = crtc_state->adjusted_mode.clock; - asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); + asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp, false); } slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 2994f07fbad9..c997f88218f2 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -514,7 +514,7 @@ static bool radeon_mst_mode_fixup(struct drm_encoder *encoder, mst_enc = radeon_encoder->enc_priv; - mst_enc->pbn = drm_dp_calc_pbn_mode(adjusted_mode->clock, bpp); + mst_enc->pbn = drm_dp_calc_pbn_mode(adjusted_mode->clock, bpp, false); mst_enc->primary->active_device = mst_enc->primary->devices & mst_enc->connector->devices; DRM_DEBUG_KMS("setting active device to %08x from %08x %08x for encoder %d\n", diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 2ba6253ea6d3..9116b2c95239 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -610,8 +610,7 @@ bool drm_dp_mst_port_has_audio(struct drm_dp_mst_topology_mgr *mgr, struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); -int drm_dp_calc_pbn_mode(int clock, int bpp); - +int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc); bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int slots); From patchwork Tue Aug 27 14:13:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117069 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 95642112C for ; Tue, 27 Aug 2019 14:13:43 +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 7C8492173E for ; Tue, 27 Aug 2019 14:13:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C8492173E 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 CCBD389B69; Tue, 27 Aug 2019 14:13:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740083.outbound.protection.outlook.com [40.107.74.83]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BEE189BA3 for ; Tue, 27 Aug 2019 14:13:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/F4MoJjQdOlES8sbQXv5UP9KnJhuiT/aT7LjBkdwuh1kxnXhfjvitogYUsKB1EYwYiFlCyoVNPy1EJqdEfhWvFPpvKCRrTYiRPMevkXPf2UPFHv6DGcfxf8vRDUmwIscjerRu7moEvNbDzZskkIj5Hj/dohPk6Xuxegh56zRVrzKKqeRDqwxEnWNYHUM4rsjeb/HkSLMUV1kpOqK3bldvx3QpExehAlVtk1WEk4/qSlTb8+nvZvmdOvbZT53gTEmHkNrMHEjODPWCXpgxDwYVTe8SfJrIKvwgEIWDJB6ViABcnr8cmZBfFmTVM2nLvS6BeRJeIDBJIxA+YnK7Vuuw== 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=hWkHcf2DlS6Cs1izW//E3WOO2f0KGvhdlt2ffJIsWn0=; b=SSXd+xKv9qGSA5x9zVqTePwKn7hSvoGDmm9KrXXVU0ep8TYDJ6AdWyxSvdwk25QaiWH3GqT83tq79yh2vc2rrFNx9oPfrNAFyC24Ph42cVYPB8Jrfi6EyneiFgoKLpVi7CT4astAXFRwM/H1MwVJsLJqhiG1l6w/GnyV3kOqICCHafX1mSZQV+JIZlBklR/v1KKxi+ZvK48MTd1zFaUV2gtGqdwQ9JiXeSHPPV4wngHNuIBHklm64JZtMKGthYFXDIGYAKOd+z88It+QTHwr28E0tiue0xXBK7UyT044fXsQDVAd/3KvfIyOeQFYG0LPBhqoaq4NEViKAKdxXkTGHQ== 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 BN6PR1201CA0010.namprd12.prod.outlook.com (2603:10b6:405:4c::20) by SN6PR12MB2720.namprd12.prod.outlook.com (2603:10b6:805:70::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.20; Tue, 27 Aug 2019 14:13:35 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::202) by BN6PR1201CA0010.outlook.office365.com (2603:10b6:405:4c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:33 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:33 +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, 27 Aug 2019 09:13:31 -0500 From: David Francis To: Subject: [PATCH v9 2/6] drm/dp_mst: Parse FEC capability on MST ports Date: Tue, 27 Aug 2019 10:13:25 -0400 Message-ID: <20190827141329.30767-3-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(376002)(346002)(136003)(39860400002)(396003)(2980300002)(428003)(199004)(189003)(1076003)(478600001)(2351001)(36756003)(316002)(16586007)(5660300002)(53936002)(48376002)(6916009)(70206006)(70586007)(50226002)(8936002)(81166006)(81156014)(356004)(6666004)(4326008)(50466002)(49486002)(446003)(47776003)(11346002)(86362001)(305945005)(2616005)(26005)(336012)(426003)(476003)(126002)(486006)(51416003)(8676002)(76176011)(2906002)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2720; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c5c411f-c8b9-4b72-459d-08d72af8bed0 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:SN6PR12MB2720; X-MS-TrafficTypeDiagnostic: SN6PR12MB2720: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: L0YenEAnAg2J73fUASpltCDio3ye6hF0MIf7gSjD7o31A0jKl20Dk6uG6dQ/IlDha4dhofi+oRpCWTNB06SZUUmLkWBYQZ0/7lCTrzvEsZH2SQPG554m9KQcybnaYogsWLaU4OpR1n2EzKds6k3HpL6Q4vZiRu/aCCmZlDHit2f5M+LhhQzI+TajZ06ndjeGwt39VPrQ5q+qfN0ykSpfUqEaliroJLc3O4uLL/3GdNyT2Gpyh7nG6aKiTcAQSJGEEotIe4pfyOMp52YeBPN3fwX3hnfo3uK0O+ILZvPhdDphMPzoZMH3RW9E5oxy4vYENSSEdIzmE4f4V6pWMCDXJlBEV2NPQunDUi2kobdcQi3wYdJw46Z55hQb8BuK6OcboGKlpp83ohGJd3w5ojVHZ4hqoiZrUFciM/SsLibVn/o= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:33.6479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c5c411f-c8b9-4b72-459d-08d72af8bed0 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: SN6PR12MB2720 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=hWkHcf2DlS6Cs1izW//E3WOO2f0KGvhdlt2ffJIsWn0=; b=2jIRAXOafRb/QqMmxfQBrh/N+VdnEFQmSKvQ2IG/xbEwPmSAW2uxR+EPWA7EWfcFAPJt2z5bj2+BMtq4zYOMSqFrhgaZNcU/ILPo6JQ9NivmLnhirxk9ZcVCqk7WEXmpVYAT5taYb7Q605RgjFWXRWWHqyT/vbYPq+2ZRYk24rU= 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As of DP1.4, ENUM_PATH_RESOURCES returns a bit indicating if FEC can be supported up to that point in the MST network. The bit is the first byte of the ENUM_PATH_RESOURCES ack reply, bottom-most bit (refer to section 2.11.9.4 of DP standard, v1.4) That value is needed for FEC and DSC support Store it on drm_dp_mst_port Signed-off-by: David Francis Reviewed-by: Lyude Paul Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ include/drm/drm_dp_mst_helper.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 3e7b7553cf4d..9f3604355705 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -553,6 +553,7 @@ static bool drm_dp_sideband_parse_enum_path_resources_ack(struct drm_dp_sideband { int idx = 1; repmsg->u.path_resources.port_number = (raw->msg[idx] >> 4) & 0xf; + repmsg->u.path_resources.fec_capable = raw->msg[idx] & 0x1; idx++; if (idx > raw->curlen) goto fail_len; @@ -2183,6 +2184,7 @@ static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, DRM_DEBUG_KMS("enum path resources %d: %d %d\n", txmsg->reply.u.path_resources.port_number, txmsg->reply.u.path_resources.full_payload_bw_number, txmsg->reply.u.path_resources.avail_payload_bw_number); port->available_pbn = txmsg->reply.u.path_resources.avail_payload_bw_number; + port->fec_capable = txmsg->reply.u.path_resources.fec_capable; } } diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 9116b2c95239..f113ae04fa88 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -108,6 +108,8 @@ struct drm_dp_mst_port { * audio-capable. */ bool has_audio; + + bool fec_capable; }; /** @@ -312,6 +314,7 @@ struct drm_dp_port_number_req { struct drm_dp_enum_path_resources_ack_reply { u8 port_number; + bool fec_capable; u16 full_payload_bw_number; u16 avail_payload_bw_number; }; From patchwork Tue Aug 27 14:13:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117075 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 AF0D014DE for ; Tue, 27 Aug 2019 14:13:49 +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 96333214DA for ; Tue, 27 Aug 2019 14:13:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96333214DA 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 D10E989BBD; Tue, 27 Aug 2019 14:13:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-eopbgr690063.outbound.protection.outlook.com [40.107.69.63]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48E9789BA3 for ; Tue, 27 Aug 2019 14:13:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=khwXTPY1EIMgqYnu7aAescuMs9dzt+/cxygu3CxngIfsNyeSbZZKZkof60npUDb/5zUfzH2ZYcvUsDGJ2aDl2ye5VoliFzSkiK7FDp4RRRt8jnDGkiSBrXCsIN7rQGUZacQ+/kTn052A85gy7eslUeU5Zk/liKtWr+Tc6ToLuUAT5iQ6uTH0p7KTn21OJtMuYUUVMoVPX8o8lA7NILkI48ADV3TFuEJRGW/HN0wG1NgWt6SE7hnm5xKnenBdIxpYJ7AoFKaVTkIw4VB1smgSGYTZ3s/gIeczYFqFX3voiq4ux/deTnVvkdmVlPfXTYZs1/iB6IXsZ4/rYvoYgsfOpA== 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=/oI2241rku6JrRwkSyCR5B0fRw0qUHJF5llSmv1WyQs=; b=CJazpWVwXT1hODRclxgtzclSjegELydfqATjKOXC2XRHFxl1yZFriEto365AoX/ui4vyAVBN6N5thV4pEkbHX+ya384IP8Nn2F8SkqqUAYqkdr5vTSPrnRaIiV2Mv3okS3FmzqU5yVJUFj6pDKSASHQ1dlT+iWGoSeCOQdVCWMdwHBTbIcV/WsW51LFdf19Dw6IEaRj4DC3ivbFR9uk2uNZ4Ky1hwI1jMshey6TYwgDN8/veRunMDLG0OVFAr2qSL9VB2Pj8xZjTepWi/ybnAQ00YlrEZWRgkw9FuZwCvD8JIa1OMRwvixokXsnA6wrsOXc64P4ThMKp1gP4vJKHSw== 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 BN6PR1201CA0010.namprd12.prod.outlook.com (2603:10b6:405:4c::20) by BYAPR12MB2710.namprd12.prod.outlook.com (2603:10b6:a03:68::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Tue, 27 Aug 2019 14:13:36 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::202) by BN6PR1201CA0010.outlook.office365.com (2603:10b6:405:4c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:36 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:36 +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, 27 Aug 2019 09:13:31 -0500 From: David Francis To: Subject: [PATCH v9 3/6] drm/dp_mst: Add MST support to DP DPCD R/W functions Date: Tue, 27 Aug 2019 10:13:26 -0400 Message-ID: <20190827141329.30767-4-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(346002)(136003)(376002)(39860400002)(396003)(2980300002)(428003)(189003)(199004)(2351001)(81166006)(70586007)(70206006)(426003)(53936002)(26005)(49486002)(316002)(50226002)(51416003)(1076003)(47776003)(48376002)(50466002)(16586007)(8936002)(6666004)(356004)(4326008)(76176011)(186003)(305945005)(5660300002)(14444005)(2906002)(86362001)(2616005)(486006)(6916009)(11346002)(478600001)(81156014)(476003)(446003)(8676002)(36756003)(126002)(336012); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2710; 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: 736e0ca4-6d0e-4607-0947-08d72af8c078 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:BYAPR12MB2710; X-MS-TrafficTypeDiagnostic: BYAPR12MB2710: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: pfc6NSUr3bruvQSq9hkj1S6uqzICEkrKYRyoWyCL1AlKNGpErqsscHtvp8fNoB2n29FToINIoBQ8wCW/NkMtSUjG7+9J3pWdSaKPRnsMMLvWydaCP+9qwYoXjaqnIaM5pFLHs3xp0Qo22C6E3MXpRKxpVzHlpB54+8DP1X8vkhly7KGEU/xmwE+DWHMlpW/2CyWfTyTkJvzuixqhRfMg7uLCUr6nzHoooFgiRHXbk3lnFytPkw1jQnuZP2Uv27XJI/pGzAFzo9P04wNsnoRwDoJrrUcHrJ8wO/q8UIt6mKXZueGJTpx+FfTUQ8m9GvIasRv29kLRSf7usQa1zDkr1dP5RejEdybibLEVbHrUAEfxtTqIWrSCIrnJE3fc1tQSYOJMHuxZ59a48Nq5wT/9c8OGd24jIDtE6m5hB77Sk1Y= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:36.4251 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 736e0ca4-6d0e-4607-0947-08d72af8c078 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: BYAPR12MB2710 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=/oI2241rku6JrRwkSyCR5B0fRw0qUHJF5llSmv1WyQs=; b=MOf0dtWURwXkZBRJ2wRFFH8SCDhudmv0fc/sgo8cIdT38nBtb8irQLaKF9jqBY7J0p52oBik+cL0r6/n8DKlyQBJ2slexokfd6QHh6RvKfaatbyJX6zxWPGSqWN/84hbfDSJ6kbjMraCYe5yr2qruDcKmb8wdy8dNp0/UIrFJhM= 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Instead of having drm_dp_dpcd_read/write and drm_dp_mst_dpcd_read/write as entry points into the aux code, have drm_dp_dpcd_read/write handle both. This means that DRM drivers can make MST DPCD read/writes. v2: Fix spacing v3: Dump dpcd access on MST read/writes Reviewed-by: Lyude Paul Reviewed-by: Harry Wentland Signed-off-by: David Francis --- drivers/gpu/drm/drm_dp_aux_dev.c | 12 ++---------- drivers/gpu/drm/drm_dp_helper.c | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c index 0cfb386754c3..418cad4f649a 100644 --- a/drivers/gpu/drm/drm_dp_aux_dev.c +++ b/drivers/gpu/drm/drm_dp_aux_dev.c @@ -163,11 +163,7 @@ static ssize_t auxdev_read_iter(struct kiocb *iocb, struct iov_iter *to) break; } - if (aux_dev->aux->is_remote) - res = drm_dp_mst_dpcd_read(aux_dev->aux, pos, buf, - todo); - else - res = drm_dp_dpcd_read(aux_dev->aux, pos, buf, todo); + res = drm_dp_dpcd_read(aux_dev->aux, pos, buf, todo); if (res <= 0) break; @@ -215,11 +211,7 @@ static ssize_t auxdev_write_iter(struct kiocb *iocb, struct iov_iter *from) break; } - if (aux_dev->aux->is_remote) - res = drm_dp_mst_dpcd_write(aux_dev->aux, pos, buf, - todo); - else - res = drm_dp_dpcd_write(aux_dev->aux, pos, buf, todo); + res = drm_dp_mst_dpcd_write(aux_dev->aux, pos, buf, todo); if (res <= 0) break; diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index ffc68d305afe..2cc21eff4cf3 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -251,7 +252,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, /** * drm_dp_dpcd_read() - read a series of bytes from the DPCD - * @aux: DisplayPort AUX channel + * @aux: DisplayPort AUX channel (SST or MST) * @offset: address of the (first) register to read * @buffer: buffer to store the register values * @size: number of bytes in @buffer @@ -280,13 +281,18 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset, * We just have to do it before any DPCD access and hope that the * monitor doesn't power down exactly after the throw away read. */ - ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_DPCD_REV, buffer, - 1); - if (ret != 1) - goto out; + if (!aux->is_remote) { + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_DPCD_REV, + buffer, 1); + if (ret != 1) + goto out; + } - ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, offset, buffer, - size); + if (aux->is_remote) + ret = drm_dp_mst_dpcd_read(aux, offset, buffer, size); + else + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, offset, + buffer, size); out: drm_dp_dump_access(aux, DP_AUX_NATIVE_READ, offset, buffer, ret); @@ -296,7 +302,7 @@ EXPORT_SYMBOL(drm_dp_dpcd_read); /** * drm_dp_dpcd_write() - write a series of bytes to the DPCD - * @aux: DisplayPort AUX channel + * @aux: DisplayPort AUX channel (SST or MST) * @offset: address of the (first) register to write * @buffer: buffer containing the values to write * @size: number of bytes in @buffer @@ -313,8 +319,12 @@ ssize_t drm_dp_dpcd_write(struct drm_dp_aux *aux, unsigned int offset, { int ret; - ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_WRITE, offset, buffer, - size); + if (aux->is_remote) + ret = drm_dp_mst_dpcd_write(aux, offset, buffer, size); + else + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_WRITE, offset, + buffer, size); + drm_dp_dump_access(aux, DP_AUX_NATIVE_WRITE, offset, buffer, ret); return ret; } From patchwork Tue Aug 27 14:13:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117071 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 D2DCA112C for ; Tue, 27 Aug 2019 14:13:45 +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 BA4AD214DA for ; Tue, 27 Aug 2019 14:13:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA4AD214DA 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 4482C89BA3; Tue, 27 Aug 2019 14:13:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790051.outbound.protection.outlook.com [40.107.79.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C7AC89B69 for ; Tue, 27 Aug 2019 14:13:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1q96z/L0Phx6Jh211EF/VWAenc2B1eapvnp5qcfeZo1n6JwjlPzmjbMS4VDQxR03EuCPB3W4yHAVtabfci+CWaNc83nwXoYRTqx/fS+2EMZ9AGM+7HUCFV6IHk2C5jPW2hzKAH2cZOS39WJerKeQaUPqEfDYnwcC9w+Vme/SoMUPAFWopPnOF2XQ234Cgfx94pSNxOQ8Fm1zGbzyiUtvF2XZWGy08Kw8q6Ytl9sIJreibtPTafChC8Th0iTIZSgrDbK2qa2n5T3+r8JMxThpXXuAj001xEAhhP7XKWxP9QTWVI+Wk2CehEX9JA4zo1v2npjFv9cWKsPHSJN6HC9eA== 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=tdEOb4F8pJJqc9hIPEG8CuY8FtGQpO9MDI9LqSEU+Io=; b=ZcrwDmcyOrNHxjEK5YTRkMjSb9hEni93FKOiPRf64Jf2LIGOodKdmzvS3VHEGwHNrCBRrBBpU5G8Npk6OlknwUL62839PXEFc6xqzyCX1RLfJ/floU2PVwcHCFyL/arABpacFgkQnNNJXPjd91P9lnFQU9XbJXQ8s1qQPHh5n6cbeKsZ0hT9ONWcEvVr2hfscy7oJZL5L2Wa7BxX/IhgOp+S3Lk+uZOCliN2bIZY1T+7d2nHJG+IU41DpNaAyn06tXA1Tu3dLpkLqGt3tRfKUJsDy2FDQgAXsJF1JBpYVYMPuMBrFNf0aHbYg5WWWX4GHQHST2KkSnq46GDoVgdTRg== 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 BN6PR1201CA0016.namprd12.prod.outlook.com (2603:10b6:405:4c::26) by BN6PR12MB1265.namprd12.prod.outlook.com (2603:10b6:404:1d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.19; Tue, 27 Aug 2019 14:13:37 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::205) by BN6PR1201CA0016.outlook.office365.com (2603:10b6:405:4c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:37 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:37 +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, 27 Aug 2019 09:13:32 -0500 From: David Francis To: Subject: [PATCH v9 4/6] drm/dp_mst: Fill branch->num_ports Date: Tue, 27 Aug 2019 10:13:27 -0400 Message-ID: <20190827141329.30767-5-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(39860400002)(396003)(346002)(376002)(136003)(2980300002)(428003)(189003)(199004)(1076003)(305945005)(86362001)(186003)(70586007)(476003)(51416003)(26005)(478600001)(76176011)(8936002)(2906002)(70206006)(356004)(6666004)(486006)(4326008)(6916009)(336012)(316002)(50466002)(16586007)(81166006)(81156014)(50226002)(126002)(446003)(47776003)(2351001)(49486002)(11346002)(36756003)(48376002)(426003)(5660300002)(53936002)(8676002)(14444005)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1265; 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: cfb770fd-86b4-4c92-534e-08d72af8c0f6 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:BN6PR12MB1265; X-MS-TrafficTypeDiagnostic: BN6PR12MB1265: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: J98CGxe8oTQ6UXRUn/2+oCRJu34z77qu/sTjzKTKY+z7oaGz177mcmy8a1o8kruRCuNFsRVJQvocyLbJzHM6EVE6Djg9gDCZS/aSaCTrgaYO7/EgQ7lE0gTzfAERs9BZB2DpU3xemiXmThAL0DaXjv9RARvPQdyhtsq4y9F38NZQcVjKTxE7K5hwtMR1E5rlI1eeRjkrXFpLfpv/w6CWvJ8RgkvmUIHNMmAnzxW/KNpWUM2KHVHH6HzYYNLUSeM22fpHjQbU07B5E1xmES36oP8eTcykmgvCtOE6dJ95AjuIn+zpyzLM6SRpM4amrwp1C16Eq0IVRN8kvlClx1eyzv9hkH3ygZFfSHY7XnD7hsPWjLxCtxX39D8GrY3ZxQWyt6Q2T2xHBRnxE6R3Jbs3aXUIjOEJDwcGLoekRSj7nP8= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:37.2628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfb770fd-86b4-4c92-534e-08d72af8c0f6 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: BN6PR12MB1265 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=tdEOb4F8pJJqc9hIPEG8CuY8FtGQpO9MDI9LqSEU+Io=; b=a2HKIfMaRDcQBEs0wNjMFAiHwDRsKvIpcUSPVmPm3T8SHVmszQavnvbVx3ztBB/sOTC3tsc/Q7IHxbpGPEWII5d/73lDdEtRM1fMu544VfWpXMcRGOYz+fgHoAvqbsVJuMqn0cA9ga5SseYYusEzpQeYvdK3wHFc7bWLJlfFqG0= 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This field on drm_dp_mst_branch was never filled It is initialized to zero when the port is kzallocced. When a port is added to the list, increment num_ports, and when a port is removed from the list, decrement num_ports. v2: remember to decrement on port removal v3: don't explicitly init to 0 Signed-off-by: David Francis Reviewed-by: Lyude Paul Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9f3604355705..502923c24450 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1669,6 +1669,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, mutex_lock(&mstb->mgr->lock); drm_dp_mst_topology_get_port(port); list_add(&port->next, &mstb->ports); + mstb->num_ports++; mutex_unlock(&mstb->mgr->lock); } @@ -1703,6 +1704,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, /* remove it from the port list */ mutex_lock(&mstb->mgr->lock); list_del(&port->next); + mstb->num_ports--; mutex_unlock(&mstb->mgr->lock); /* drop port list reference */ drm_dp_mst_topology_put_port(port); From patchwork Tue Aug 27 14:13:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117073 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 E881214DE for ; Tue, 27 Aug 2019 14:13:47 +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 CF3DD214DA for ; Tue, 27 Aug 2019 14:13:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF3DD214DA 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 0427D89BCD; Tue, 27 Aug 2019 14:13:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-eopbgr800089.outbound.protection.outlook.com [40.107.80.89]) by gabe.freedesktop.org (Postfix) with ESMTPS id E74AF89BB0 for ; Tue, 27 Aug 2019 14:13:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RinhXnq8IyDVS35r8P0nIi65wMDZ7w2O+jJDtt0hhdQacKecXZcyeGx78csXWL4HAivyu2dmFEaIZaJDhTckqhZ7bM59p20B1cxhNEsbj6VdrE42yyKUD88TC5NbHsuCYbWUopj1ymJse3/Dik7D9x7mrv4UboDaAkp1Q+RhjEs7imqu5sLHGPxiVhjaACZL/xe4knWk9phMZuo2Mq8+2XVl32vkZbDesuONQEoS+/j7DjqNeF2+CVIs01xRJzr10mxDER07xT+uJbVpUWLdnOYpf+mymiFhGu3Mp7w6C1EEocAXfEoo8xS/3BoKtVhuNzHTsvoOPgMdQdtusEvHYg== 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=4qBLjLZxGeeYLEGdGSvbiw43tHYJTyUvDcrRzLNxpm0=; b=X9uk5BJj46j+ZdMNrwvyQQzvn8rVx+J6Vd9lWT5v22hfhuLmRT4pT/SyND7RmXggfKe93QZSce1S5QOfpE9h8kLHDMFqWYelfSwmSy1ai8KzXViwkT6+N63MFVjcOubGhM4OZC0sEgMrhLAeLA7OFlePJ1Qa84/LEcwcy1UvUx+2DvlGRqUID2pru7fndMEV2vRg8eNVGMA8nB1dt+gSJRhjPSx3LtKA0oa4BHnyvY1tU9uXKh4O0YcpguPn5QEF00T6vKXjKjjDEMAnmG4gFJi798qOB1+UYfmgWGCEv8GJvaEVZ1emKHLI7o8rrimYGWif3+BR7NjYPhYPu8TlXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from BN6PR1201CA0010.namprd12.prod.outlook.com (2603:10b6:405:4c::20) by DM6PR12MB2715.namprd12.prod.outlook.com (2603:10b6:5:4a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Tue, 27 Aug 2019 14:13:38 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::202) by BN6PR1201CA0010.outlook.office365.com (2603:10b6:405:4c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:38 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:37 +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, 27 Aug 2019 09:13:32 -0500 From: David Francis To: Subject: [PATCH v9 5/6] drm/dp_mst: Add new quirk for Synaptics MST hubs Date: Tue, 27 Aug 2019 10:13:28 -0400 Message-ID: <20190827141329.30767-6-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(396003)(346002)(376002)(39860400002)(136003)(2980300002)(428003)(189003)(199004)(426003)(446003)(2351001)(305945005)(14444005)(2906002)(8936002)(4326008)(50226002)(48376002)(316002)(6666004)(50466002)(53936002)(16586007)(356004)(54906003)(51416003)(76176011)(86362001)(2616005)(26005)(1076003)(186003)(478600001)(5660300002)(49486002)(6916009)(47776003)(486006)(70206006)(81156014)(36756003)(336012)(11346002)(126002)(70586007)(476003)(81166006)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB2715; 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: 615b7ad1-2fe6-4c9f-d703-08d72af8c184 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:DM6PR12MB2715; X-MS-TrafficTypeDiagnostic: DM6PR12MB2715: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: GtI4SD6rvU3lCgAzN8HjkUBMtDgF8Oel/+RUO+qTAgBlyjc0B7Udgr3NAufKDb3RVHqF77faQ+fSwVJEtZ9z174Xptoru9L/1NNQveW3NwOw9kKrq75XIbipJOnVqHcQ6hesyEFHQImfwklDqBeRvYUo9O9Tp4/teANPGhMMmg5VsbZ0ohAdctoiE6OSBmq+mu2ubT3f0dz/wRaKLeOCkQ7nNzNy3koZZYksCEL311Pskgl7bfamll6qfXHwZyJco3EzfL/Sd6Qyjj+N5LhtSp5msiESsAmw1Kmrk9dEf98UEZynanUCXcg8SgXr/GuGUutwfZ3iGUjj6PtGiOcLfhJPinTR7fC1dtEDJtv6/E6TmH9BdlUTg2e31tVDyV+TFlpVpN16pd8EI7GfJXuncIfyshu4MaGOGC8epjye8/8= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:37.9946 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 615b7ad1-2fe6-4c9f-d703-08d72af8c184 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: DM6PR12MB2715 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=4qBLjLZxGeeYLEGdGSvbiw43tHYJTyUvDcrRzLNxpm0=; b=HCowOkO1eokFc50PgZcxNmRRtK8HR72Ff/admDC0S2YsbGdzPvkkd9u//4cnukzu0iBEYvlzt7xOQGJ4mvCPg7qLxeZCl8/FQWS3dIh2SQRkLT9CHJWBhERiz9tukss9NPFcY01A04EeUDvenvh86iN1fHXq86tBUCBQZcsWrt8= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; linux.intel.com; dkim=none (message not signed) header.d=none;linux.intel.com; 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Synaptics DP1.4 hubs (BRANCH_ID 0x90CC24) do not support virtual DPCD registers, but do support DSC. The DSC caps can be read from the physical aux, like in SST DSC. These hubs have many different DEVICE_IDs. Add a new quirk to detect this case. Cc: Lyude Paul Cc: Jani Nikula Cc: Harry Wentland Reviewed-by: Wenjing Liu Signed-off-by: David Francis --- drivers/gpu/drm/drm_dp_helper.c | 2 ++ include/drm/drm_dp_helper.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 2cc21eff4cf3..fc39323e7d52 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -1270,6 +1270,8 @@ static const struct dpcd_quirk dpcd_quirk_list[] = { { OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR) }, /* CH7511 seems to leave SINK_COUNT zeroed */ { OUI(0x00, 0x00, 0x00), DEVICE_ID('C', 'H', '7', '5', '1', '1'), false, BIT(DP_DPCD_QUIRK_NO_SINK_COUNT) }, + /* Synaptics DP1.4 MST hubs can support DSC without virtual DPCD */ + { OUI(0x90, 0xCC, 0x24), DEVICE_ID_ANY, true, BIT(DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD) }, }; #undef OUI diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 8364502f92cf..a1331b08705f 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1434,6 +1434,13 @@ enum drm_dp_quirk { * The driver should ignore SINK_COUNT during detection. */ DP_DPCD_QUIRK_NO_SINK_COUNT, + /** + * @DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD: + * + * The device supports MST DSC despite not supporting Virtual DPCD. + * The DSC caps can be read from the physical aux instead. + */ + DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD, }; /** From patchwork Tue Aug 27 14:13:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117077 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 4FB44112C for ; Tue, 27 Aug 2019 14:13:51 +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 37199214DA for ; Tue, 27 Aug 2019 14:13:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37199214DA 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 1CD9089BC2; Tue, 27 Aug 2019 14:13:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740082.outbound.protection.outlook.com [40.107.74.82]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6DAF89BBD for ; Tue, 27 Aug 2019 14:13:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UhHWKhJsH9jUc6sXYR+8N1tapzjib/4yFFUwCk+TQwY8qWdhb1MDQ9gbRWiigCPZzom8xWp0wePE29QNoyvL5+Vd4vh1Kp8Hdjqj+YcGZo2Vvx5wSMli4P6VXmixSPxjxfdEc4K5qpdRRokhQeBw0FcwOSEmRKgEtJl5ZIomzvNWYtBEdRBsgYeviX//e5Nq4/QmM/lN3WFy+uGplD3yGp3NSFwvFDkQG8Vcj145n+RbrFCFarNHQn4GEthJcNO+Lt/keyw8oca2KfM6cJ9GTwxAfV6H4vSZ7h0va7E1B0XtMzbZnRyne3pv+7BzRk7oHaO8n5tJYVrHAog2lxGWzQ== 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=b9+CsAHmQZJIT/OeJW1vpVXkwnCHncYnxgaA7TLZ+NY=; b=Y1jdVAd6KNSV2nwqlaVlShwgal7nOluqa8s8F9IPAanyuOyD+vdsLiJ5Gs2wJ+Xws0TtxOEFmRb8270mq3tqg0XMI2U/GqCgeFHkHY9W8Whmdo/V1t1WFB3h8U1qWtd8Q2RcSy7O+PlUKH5yQKMostJNBRAmpXPw/wk/iQKxNicxaUPSYI0IArWQuJ8k5wD81j8FCF9ROAyLVH6QLY2q4ptX6VyjS5viej2MJ/Mqjp7/niPHwKq/MqMceR7BqbWioyJd5gL/pqEgJEq+xRvQ3ahVwxr5IF6thNTQyC3ejslwegf3VDyuAXZ/cgLalagqCIMP6Dxv7FZ6G6BRf0lw4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.intel.com smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from BN6PR1201CA0009.namprd12.prod.outlook.com (2603:10b6:405:4c::19) by BYAPR12MB2712.namprd12.prod.outlook.com (2603:10b6:a03:68::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Tue, 27 Aug 2019 14:13:39 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::209) by BN6PR1201CA0009.outlook.office365.com (2603:10b6:405:4c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:39 +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 DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) 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, 27 Aug 2019 14:13:39 +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, 27 Aug 2019 09:13:33 -0500 From: David Francis To: Subject: [PATCH v9 6/6] drm/dp_mst: Add helpers for MST DSC and virtual DPCD aux Date: Tue, 27 Aug 2019 10:13:29 -0400 Message-ID: <20190827141329.30767-7-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-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)(4636009)(376002)(396003)(39860400002)(346002)(136003)(2980300002)(428003)(189003)(199004)(14444005)(26005)(5024004)(51416003)(76176011)(186003)(6916009)(478600001)(70586007)(2351001)(70206006)(81166006)(81156014)(8676002)(305945005)(50226002)(8936002)(48376002)(16586007)(54906003)(316002)(1076003)(4326008)(126002)(2906002)(476003)(50466002)(486006)(11346002)(336012)(446003)(49486002)(2616005)(356004)(426003)(36756003)(86362001)(6666004)(53936002)(47776003)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2712; 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: d42e0e49-5a90-4cd4-ffe3-08d72af8c221 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:BYAPR12MB2712; X-MS-TrafficTypeDiagnostic: BYAPR12MB2712: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Zd6Mz8CfV+DiNjFNa9yxY9I67y2wmrWVR7Dm2OcRGGGY2K8lKI7YkKOdshmGh6Qny0wwYiOn1IaJaKrNsGJxluSiaNYjA0vcNCfYzz/HWRiriGxBJ0tJG4eiUniRccbOJacoPzwkkwF0Vy6wtdCvleC6HJS8XTxHsav4fthM8ZMkhvBJeu/grrHtMD2z7Q2hmVnUz1ty8N34kVSY6gmWDJALMpXzMlY4I2WISJoscBvHt5ckcW4/Nts+5uVvqA1CexqMvxbJlhB2kdBVXBQBodkWrlck6UAQlFsdYLmByWE9IaOGKy3KOAlXF/pbwJRN4DIUdwZOOL8N+2YMhA6nN0VGPqCcxq84QQGT1pV6DMDWVCOUIqG7pc+TKtTAL3fz/peJc1Eq0Fuli94D5CeofvYskmH3PYqpPa9CDBdh1RM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:39.1196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d42e0e49-5a90-4cd4-ffe3-08d72af8c221 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: BYAPR12MB2712 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=b9+CsAHmQZJIT/OeJW1vpVXkwnCHncYnxgaA7TLZ+NY=; b=pUI4AujUn3GCobB8gTlvt2286ZxRKiMDY5rrMZpQd7I0iaGfQJ0e1LMNlcmf1BHPBveWMOdTRzAoNrqpsDw4w4QNiTVvAHs3RB1skbYo3ZsL3Js4dB20CiF0ZLFOzf1BXCaKWkq2/3HDs28NQmxdNAnKEk4NPCokYDEkmP6gyaw= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; linux.intel.com; dkim=none (message not signed) header.d=none;linux.intel.com; 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add drm_dp_mst_dsc_aux_for_port. To enable DSC, the DSC_ENABLED register might have to be written on the leaf port's DPCD, its parent's DPCD, or the MST manager's DPCD. This function finds the correct aux for the job. As part of this, add drm_dp_mst_is_virtual_dpcd. Virtual DPCD is a DP feature new in DP v1.4, which exposes certain DPCD registers on virtual ports. v2: Remember to unlock mutex on all paths v3: Refactor to match coding style and increase brevity Cc: Lyude Paul Cc: Jani Nikula Cc: Harry Wentland Reviewed-by: Wenjing Liu Signed-off-by: David Francis --- drivers/gpu/drm/drm_dp_mst_topology.c | 153 ++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 2 + 2 files changed, 155 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 502923c24450..e24dba276119 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -4150,3 +4150,156 @@ static void drm_dp_mst_unregister_i2c_bus(struct drm_dp_aux *aux) { i2c_del_adapter(&aux->ddc); } + +/** + * drm_dp_mst_is_virtual_dpcd() - Is the given port a virtual DP Peer Device + * @port: The port to check + * + * A single physical MST hub object can be represented in the topology + * by multiple branches, with virtual ports between those branches. + * + * As of DP1.4, An MST hub with internal (virtual) ports must expose + * certain DPCD registers over those ports. See sections 2.6.1.1.1 + * and 2.6.1.1.2 of Display Port specification v1.4 for details. + * + * May acquire mgr->lock + * + * Returns: + * true if the port is a virtual DP peer device, false otherwise + */ +static bool drm_dp_mst_is_virtual_dpcd(struct drm_dp_mst_port *port) +{ + struct drm_dp_mst_port *downstream_port; + + if (!port || port->dpcd_rev < DP_DPCD_REV_14) + return false; + + /* Virtual DP Sink (Internal Display Panel) */ + if (port->port_num >= 8) + return true; + + /* DP-to-HDMI Protocol Converter */ + if (port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV && + !port->mcs && + port->ldps) + return true; + + /* DP-to-DP */ + mutex_lock(&port->mgr->lock); + if (port->pdt == DP_PEER_DEVICE_MST_BRANCHING && + port->mstb && + port->mstb->num_ports == 2) { + list_for_each_entry(downstream_port, &port->mstb->ports, next) { + if (downstream_port->pdt == DP_PEER_DEVICE_SST_SINK && + !downstream_port->input) { + mutex_unlock(&port->mgr->lock); + return true; + } + } + } + mutex_unlock(&port->mgr->lock); + + return false; +} + +/** + * drm_dp_mst_dsc_aux_for_port() - Find the correct aux for DSC + * @port: The port to check. A leaf of the MST tree with an attached display. + * + * Depending on the situation, DSC may be enabled via the endpoint aux, + * the immediately upstream aux, or the connector's physical aux. + * + * This is both the correct aux to read DSC_CAPABILITY and the + * correct aux to write DSC_ENABLED. + * + * This operation can be expensive (up to four aux reads), so + * the caller should cache the return. + * + * Returns: + * NULL if DSC cannot be enabled on this port, otherwise the aux device + */ +struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port) +{ + struct drm_dp_mst_port *immediate_upstream_port; + struct drm_dp_mst_port *fec_port; + struct drm_dp_desc *desc = NULL; + + if (!port) + return NULL; + + if (port->parent) + immediate_upstream_port = port->parent->port_parent; + else + immediate_upstream_port = NULL; + + fec_port = immediate_upstream_port; + while (fec_port) { + /* + * Each physical link (i.e. not a virtual port) between the + * output and the primary device must support FEC + */ + if (!drm_dp_mst_is_virtual_dpcd(fec_port) && + !fec_port->fec_capable) + return NULL; + + fec_port = fec_port->parent->port_parent; + } + + /* DP-to-DP peer device */ + if (drm_dp_mst_is_virtual_dpcd(immediate_upstream_port)) { + u8 upstream_dsc; + u8 endpoint_dsc; + u8 endpoint_fec; + + if (drm_dp_dpcd_read(&port->aux, + DP_DSC_SUPPORT, &endpoint_dsc, 1) < 0) + return NULL; + if (drm_dp_dpcd_read(&port->aux, + DP_FEC_CAPABILITY, &endpoint_fec, 1) < 0) + return NULL; + if (drm_dp_dpcd_read(&immediate_upstream_port->aux, + DP_DSC_SUPPORT, &upstream_dsc, 1) < 0) + return NULL; + + /* Enpoint decompression with DP-to-DP peer device */ + if ((endpoint_dsc & DP_DSC_DECOMPRESSION_IS_SUPPORTED) && + (endpoint_fec & DP_FEC_CAPABLE) && + (upstream_dsc & 0x2) /* DSC passthrough */) + return &port->aux; + + /* Virtual DPCD decompression with DP-to-DP peer device */ + return &immediate_upstream_port->aux; + } + + /* Virtual DPCD decompression with DP-to-HDMI or Virtual DP Sink */ + if (drm_dp_mst_is_virtual_dpcd(port)) + return &port->aux; + + /* + * Synaptics quirk + * Applies to ports for which: + * - Physical aux has Synaptics OUI + * - DPv1.4 or higher + * - Port is on primary branch device + * - Not a VGA adapter (DP_DWN_STRM_PORT_TYPE_ANALOG) + */ + if (!drm_dp_read_desc(port->mgr->aux, desc, true)) + return false; + + if (drm_dp_has_quirk(desc, DP_DPCD_QUIRK_DSC_WITHOUT_VIRTUAL_DPCD && + port->mgr->dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14) && + port->parent == port->mgr->mst_primary) { + u8 downstreamport; + + drm_dp_dpcd_read(&port->aux, DP_DOWNSTREAMPORT_PRESENT, + &downstreamport, 1); + + if ((downstreamport & DP_DWN_STRM_PORT_PRESENT) && + ((downstreamport & DP_DWN_STRM_PORT_TYPE_MASK) + != DP_DWN_STRM_PORT_TYPE_ANALOG)) + return port->mgr->aux; + } + + return NULL; +} +EXPORT_SYMBOL(drm_dp_mst_dsc_aux_for_port); diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index f113ae04fa88..4cf738545dfb 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -673,6 +673,8 @@ int __must_check drm_dp_mst_atomic_check(struct drm_atomic_state *state); void drm_dp_mst_get_port_malloc(struct drm_dp_mst_port *port); void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port); +struct drm_dp_aux *drm_dp_mst_dsc_aux_for_port(struct drm_dp_mst_port *port); + extern const struct drm_private_state_funcs drm_dp_mst_topology_state_funcs; /**