From patchwork Fri Jan 20 07:38:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9527637 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 B447B60434 for ; Fri, 20 Jan 2017 07:39:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A549428620 for ; Fri, 20 Jan 2017 07:39:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98EE228642; Fri, 20 Jan 2017 07:39:15 +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 1FD6428620 for ; Fri, 20 Jan 2017 07:39:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED3A06EB35; Fri, 20 Jan 2017 07:39:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3171D6EB22 for ; Fri, 20 Jan 2017 07:39:00 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OK200F2YIKY5150@mailout4.w1.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 20 Jan 2017 07:38:58 +0000 (GMT) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170120073858eucas1p24527378aa37c0a1d5e132d7090d3de0b~bas60XLtI3262832628eucas1p2f; Fri, 20 Jan 2017 07:38:58 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges4.samsung.com (EUCPMTA) with SMTP id 07.F8.28517.19EB1885; Fri, 20 Jan 2017 07:38:57 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170120073857eucas1p1776cb0ca12d233450c81cbeab053f729~bas6KifLH0436104361eucas1p1o; Fri, 20 Jan 2017 07:38:57 +0000 (GMT) X-AuditID: cbfec7f4-f79716d000006f65-e3-5881be91becd Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id C6.08.06687.CCEB1885; Fri, 20 Jan 2017 07:39:56 +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 <0OK200LE1IKT7D70@eusync1.samsung.com>; Fri, 20 Jan 2017 07:38:57 +0000 (GMT) From: Andrzej Hajda To: Archit Taneja , dri-devel@lists.freedesktop.org Subject: [PATCH 09/24] drm/bridge/sii8620: fix peer device capabilities read code Date: Fri, 20 Jan 2017 08:38:35 +0100 Message-id: <1484897930-1275-10-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1484897930-1275-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsWy7djPc7oT9zVGGPx4YWFxa905Voumjres FhtnrGe1uPL1PZvFpPsTWCzWHrnL7sDmcbmvl8njfvdxJo++LasYA5ijuGxSUnMyy1KL9O0S uDK2t0gWHOGpmN78lq2BcQ9XFyMnh4SAicSmsyeZIWwxiQv31rN1MXJxCAksZZS4ePIFI4Tz mVFiYsMeNpiOzl+NrBCJZYwSkybOZIFw/jNKrH7YwwhSxSagKfF3802wDhEBb4k5q/vA4swC 6xklrp2KA7GFBYIlDjc9YAKxWQRUJW4vWwJkc3DwCjhLtDbIQCyTk7h5rhPsPE6g8PkbX5hA dkkI3GaTaGx4wwZSLyEgK7HpANQLLhK9NxdCHSos8er4FnYIW0ais+MgVG83o8Sn/hPsEM4U Rol/H2ZAdVtLHD5+kRXiUD6JSdumM0Ms4JXoaBOCKPGQeN35GKrcUeLL4zvMEM9PY5ToO7eF ZQKjzAJGhlWMIqmlxbnpqcUmesWJucWleel6yfm5mxiBUXr63/EvOxgXH7M6xCjAwajEw5tw rCFCiDWxrLgy9xCjBAezkghvz/rGCCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8exZcCRcSSE8s Sc1OTS1ILYLJMnFwSjUwevmYzdydyfNdvkft2WTb/E0aRv6/vhh/PNtXm1sVyultMDmRO0NV tXTypEsNO3smRyY8/dDf+JS9zvXGt4L0gtpyjf7Xmfe1JrtuOsfE+XvthWSmLs+sohk39A10 2r/JX378oFD0zp6SvDPH3m5ZXP1A1/1m+E5z4/Lwc9v++6SsPvDs1GY1JZbijERDLeai4kQA /6mMJ84CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t/xy7pn9jVGGOy5qmBxa905Voumjres FhtnrGe1uPL1PZvFpPsTWCzWHrnL7sDmcbmvl8njfvdxJo++LasYA5ij3GwyUhNTUosUUvOS 81My89JtlUJD3HQtlBTyEnNTbZUidH1DgpQUyhJzSoE8IwM04OAc4B6spG+X4JaxvUWy4AhP xfTmt2wNjHu4uhg5OSQETCQ6fzWyQthiEhfurWfrYuTiEBJYwihx/fRSZginkUlixt5mNpAq NgFNib+bb4LZIgLeEnNW9zGCFDELrGeUmPr4LztIQlggWOJw0wMmEJtFQFXi9rIlQDYHB6+A s0RrgwzENjmJm+c6mUFsTqDw+RtfwEqEBJwkrs2SncDIu4CRYRWjSGppcW56brGhXnFibnFp Xrpecn7uJkZgsG479nPzDsZLG4MPMQpwMCrx8CYca4gQYk0sK67MPcQowcGsJMLbs74xQog3 JbGyKrUoP76oNCe1+BCjKdBJE5mlRJPzgZGUVxJvaGJobmloZGxhYW5kpCTOW/LhSriQQHpi SWp2ampBahFMHxMHp1QDo9DBN+/ztk9dXPghisXDMd4mQSpM4NyOje/S3v36xfbuqaKQ5VTL zN6/05xXXGi9rpd+V9pq3/ks7vir7ovdVb2ZzV58TNP21Rd3VG/3fr1j/dEru4+92ldgoLxd /UnKRa3QV00xWrpbV27hPPqyyHe3aO6ym7UHgypPB29Ivf5e3CFLsuF9oBJLcUaioRZzUXEi AAmXSf1sAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170120073857eucas1p1776cb0ca12d233450c81cbeab053f729 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 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: 20170120073857eucas1p1776cb0ca12d233450c81cbeab053f729 X-RootMTR: 20170120073857eucas1p1776cb0ca12d233450c81cbeab053f729 References: <1484897930-1275-1-git-send-email-a.hajda@samsung.com> Cc: Marek Szyprowski , Bartlomiej Zolnierkiewicz 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,