From patchwork Wed Feb 1 07:47:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9549027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86AFE60425 for ; Wed, 1 Feb 2017 07:48:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77D1A28338 for ; Wed, 1 Feb 2017 07:48:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CBF928375; Wed, 1 Feb 2017 07:48:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 195AF28338 for ; Wed, 1 Feb 2017 07:48:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33E616E658; Wed, 1 Feb 2017 07:48:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16F206E590 for ; Wed, 1 Feb 2017 07:47:59 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKO00B0WQZXGR60@mailout2.w1.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 01 Feb 2017 07:47:57 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170201074756eucas1p199cfa206981d8e92929a0dc4d7309d34~fGkLyG1Tc0704907049eucas1p16; Wed, 1 Feb 2017 07:47:56 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 93.5A.28517.CA291985; Wed, 1 Feb 2017 07:47:56 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170201074756eucas1p281cfbbc4be0d098f3e2b7aea3eb80d36~fGkLDSv4B1056110561eucas1p2x; Wed, 1 Feb 2017 07:47:56 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-b2-589192ac25d4 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 8E.35.10233.BA291985; Wed, 1 Feb 2017 07:47:55 +0000 (GMT) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OKO00GROQZTN370@eusync1.samsung.com>; Wed, 01 Feb 2017 07:47:55 +0000 (GMT) From: Andrzej Hajda To: Archit Taneja , dri-devel@lists.freedesktop.org Subject: [PATCH v3 09/25] drm/bridge/sii8620: fix peer device capabilities read code Date: Wed, 01 Feb 2017 08:47:36 +0100 Message-id: <1485935272-17337-10-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1485935272-17337-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKIsWRmVeSWpSXmKPExsWy7djP87prJk2MMHj9RM2iqeMtq8WVr+/Z HJg8Lvf1Mnnc7z7OFMAUxWWTkpqTWZZapG+XwJWxvUWy4AhPxfTmt2wNjHu4uhg5OSQETCR+ 929kh7DFJC7cW88GYgsJLGWU+H5OqouRC8j+zCjxYNF7dpiGB5P/sUAkljFK/Lv+gx3C+c8o cfb0S1aQKjYBTYm/m2+CjRIR8JaYs7qPEcQWFgiT+LN+EzOIzSKgKtHds4gFxOYVcJF4+mAy I8QGOYmb5zrBajiB4s8XzmGBiK9gk3jbWd7FyAFky0psOsAMEXaR+N3zkg3CFpZ4dXwL1KEy Epcnd4MdKiHQzSjxqf8EO4QzBejqDzOguq0lDh+/CHY0swCfxKRt05khFvBKdLQJQZR4SOy4 co0JwnaUmPdmN9T30xklPrccYp7AKL2AkWEVo0hqaXFuemqxiV5xYm5xaV66XnJ+7iZGYGSd /nf8yw7GxcesDjEKcDAq8fDOODkhQog1say4MvcQowQHs5II74z+iRFCvCmJlVWpRfnxRaU5 qcWHGKU5WJTEefcsuBIuJJCeWJKanZpakFoEk2Xi4JRqYAytaFB51jPzh8v/MKbHte6GXsaf pia5NpRe/TrPnYvrmPTJG8lGSV08cmdeHjrZ1H62f//Su+IzE/Rnxx+V0ovTYHrE1Mj08f1b 4xk3i4KS+HMjxC/3yNRY/mPk6g587F5he9Wmtd605Yf18gU57afKbiYkxB9ZJpaxcrvXb6HC qvMbHrSXKLEUZyQaajEXFScCACuHi/aoAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCLMWRmVeSWpSXmKPExsVy+t/xy7qrJ02MMPh7k8uiqeMtq8WVr+/Z HJg8Lvf1Mnnc7z7OFMAU5WaTkZqYklqkkJqXnJ+SmZduqxQa4qZroaSQl5ibaqsUoesbEqSk UJaYUwrkGRmgAQfnAPdgJX27BLeM7S2SBUd4KqY3v2VrYNzD1cXIySEhYCLxYPI/FghbTOLC vfVsXYxcHEICSxgluq/8ZQZJCAk0Mkl8nFQPYrMJaEr83XyTDcQWEfCWmLO6jxHEFhYIk7h6 eBLYIBYBVYnunkVgNq+Ai8TTB5MZIRbISdw81wk2kxMo/nzhHBaI+c4S3+7OYp/AyLOAkWEV o0hqaXFuem6xkV5xYm5xaV66XnJ+7iZGYIhtO/Zzyw7GrnfBhxgFOBiVeHg/nJ4QIcSaWFZc mXuIUYKDWUmEd0b/xAgh3pTEyqrUovz4otKc1OJDjKZAR01klhJNzgeGf15JvKGJobmloZGx hYW5kZGSOO/UD1fChQTSE0tSs1NTC1KLYPqYODilGhi3T/r9ZKfAq1s5l2o754cazVPx9RSu mLiTN9X6+Pb1X2Y/YdHdzuT/c+LsYqWlrIzlZauO3vbJXGv+MGvv1NAqt4Ya8ZorsWKt6acm eR9aa5Ucxnvik1Z5caLEatHkB/YHJvDtPXix5XLjsf7q7q8/WfZzNgr+kHWWeCYr3bP5traZ 4U0PvzdKLMUZiYZazEXFiQBxaKWlRwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170201074756eucas1p281cfbbc4be0d098f3e2b7aea3eb80d36 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170201074756eucas1p281cfbbc4be0d098f3e2b7aea3eb80d36 X-RootMTR: 20170201074756eucas1p281cfbbc4be0d098f3e2b7aea3eb80d36 References: <1485935272-17337-1-git-send-email-a.hajda@samsung.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Peer capabilities should be read differently depending on protocol version. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/bridge/sil-sii8620.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 3842226..be953f3 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -1412,7 +1412,8 @@ static void sii8620_status_changed_path(struct sii8620 *ctx) sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE), MHL_DST_LM_CLK_MODE_NORMAL | MHL_DST_LM_PATH_ENABLED); - sii8620_mt_read_devcap(ctx, false); + if (!sii8620_is_mhl3(ctx)) + sii8620_mt_read_devcap(ctx, false); } else { sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE), MHL_DST_LM_CLK_MODE_NORMAL); @@ -1664,6 +1665,14 @@ static void sii8620_irq_infr(struct sii8620 *ctx) sii8620_start_video(ctx); } +static void sii8620_got_xdevcap(struct sii8620 *ctx, int ret) +{ + if (ret < 0) + return; + + sii8620_mt_read_devcap(ctx, false); +} + static void sii8620_irq_tdm(struct sii8620 *ctx) { u8 stat = sii8620_readb(ctx, REG_TRXINTH); @@ -1675,6 +1684,7 @@ static void sii8620_irq_tdm(struct sii8620 *ctx) ctx->burst.r_size = SII8620_BURST_BUF_LEN; sii8620_burst_tx_rbuf_info(ctx, SII8620_BURST_BUF_LEN); sii8620_mt_read_devcap(ctx, true); + sii8620_mt_set_cont(ctx, sii8620_got_xdevcap); } else { sii8620_write_seq_static(ctx, REG_MHL_PLL_CTL2, 0,