From patchwork Mon Aug 26 14:09:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11114711 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 520AE14E5 for ; Mon, 26 Aug 2019 14:09:38 +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 38E852053B for ; Mon, 26 Aug 2019 14:09:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38E852053B 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 36F1789518; Mon, 26 Aug 2019 14:09:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770048.outbound.protection.outlook.com [40.107.77.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1ACED8924F for ; Mon, 26 Aug 2019 14:09:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hx3QfUwh4zPI8Gc09RzZ8ODdsd6T24ulsnf6rMp8EqNY65NMW8X2UBF2w0+wRsp11ylT0lFj6Q2lq70Wz7hE42RWWk2DLxXDHZNU8S5kvPQhr8oJqTqJVeQQXjFBM5+AMjBrDTgfB+GccbmGKEZ6JSgp31HjZf2q8MMf3SZIrMb0hLBEuL3RpLKuScGP7r/D+t/BpZbYp7qIyvLFLf6gIbwB0tXbDnNhrmeYcelyEQkrv/mibhnmDspYyy4PG1zBsJBSfNO2hDmRKxImP01s36gOrj/hF6/pOQ5EOio3qSb/6+SJA2i+M9fewR8MogpWgCQeNN+QH+gxs7AxM9FnLQ== 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=C978YRaoHGcoNzrkPOW7NIP8XnezeR4rytagLslfHUE=; b=lFrIXFvYhqQon34YU3SYCsoCTV5Win8sx3RTLIukjAb1uC1mmwl3QWGXz72wV2DGqyaN7qQ8cYq2DwZ9Qmx3P4/ru3vvgRertnGY9kxI3BUAmYBN/wJNspKl9AiECW81jYZXcwNAsCg8UAjkQ7+spBcYWv9POIP4A3A0HNKpY68dMyv5gRIWLFiQJr0eYGe04bKsCllw/6YHFYFIiZ57AYpM+ymzlx1Nbns7gMdrf9tqryDwI/aZZMEhMetmPozDc710zr3sBj1zXXmYMZw6Gk6UFq5zwArufscStVgG7meh6IfK0/r0R/ZJUU7ON6Sg59c8MXhvo4NYN5wEgEB7nQ== 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 DM5PR12CA0066.namprd12.prod.outlook.com (2603:10b6:3:103::28) by CY4PR12MB1270.namprd12.prod.outlook.com (2603:10b6:903:43::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.21; Mon, 26 Aug 2019 14:09:31 +0000 Received: from BY2NAM03FT058.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by DM5PR12CA0066.outlook.office365.com (2603:10b6:3:103::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Mon, 26 Aug 2019 14:09:28 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT058.mail.protection.outlook.com (10.152.85.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 26 Aug 2019 14:09:28 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Mon, 26 Aug 2019 09:09:07 -0500 From: David Francis To: Subject: [PATCH v6 3/6] drm/dp_mst: Add MST support to DP DPCD R/W functions Date: Mon, 26 Aug 2019 10:09:00 -0400 Message-ID: <20190826140903.12580-4-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190826140903.12580-1-David.Francis@amd.com> References: <20190826140903.12580-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)(136003)(346002)(39860400002)(376002)(396003)(2980300002)(428003)(199004)(189003)(2351001)(186003)(26005)(8936002)(36756003)(446003)(426003)(126002)(5660300002)(49486002)(50226002)(476003)(81156014)(8676002)(81166006)(11346002)(2616005)(486006)(4326008)(48376002)(14444005)(86362001)(336012)(53936002)(50466002)(478600001)(316002)(16586007)(6916009)(305945005)(70586007)(70206006)(1076003)(47776003)(51416003)(6666004)(356004)(2906002)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1270; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d3af8f4a-94fd-46d7-b900-08d72a2f0254 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:CY4PR12MB1270; X-MS-TrafficTypeDiagnostic: CY4PR12MB1270: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 01415BB535 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: mMutHsl8HycZcAQldu8V8wDz5v0eh00WcZZQiERDTRNH81FxbCgQduDDwAHpKTSrKZLEcUbZz658N4nDnPeFfG4BIsRlcs34Oxqla/StTywMBtwJjuwVb7OPocV0fPB5PTMrDDp+37RGbw6+DX1OBWmewdWpLCgQFIv74xMd7uoeydFr/lRWm+iBIVgRi7+ALBP6aD/BzuGjFL1906wbWr6tsvw5tuFpQRrAbtXY6Oh+ZUuWbw6dtCe0xjsL7/Zq1MJkkt4UQJZ2w8UfB8DW+GWi9vTdhayIRw0jCS8dKYds9JWlZA5vc+T4YOfKx8+pxelKvJMg0FOwvUG7KPc8p9a0IBIOCT7zPBNSyh1/zGwtUxQJNgdXlib+Icb76wWiBgMmq3AsaZkEtdjHWPggiHouwmMFRG7V5sAlG/1yFZU= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2019 14:09:28.5599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3af8f4a-94fd-46d7-b900-08d72a2f0254 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1270 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=C978YRaoHGcoNzrkPOW7NIP8XnezeR4rytagLslfHUE=; b=YSxuRjLz92ilH0QgSXRb24fIPHGVJ0FGyuB7ytkOXAmN4acHC/f7mtVHJMlhp/Ffs05nliABvLW3icb4+NkWY8vv6BApiL/3OQ1Mk1ohgOLrWumvlV7M+yHsaqQUxLVrpWSPQfX1+qASf+jVKlgC6i7o3DpEDK0Q1rdcELlFkfM= 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 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; }