From patchwork Fri Jan 20 07:38:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9527669 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 DA97160434 for ; Fri, 20 Jan 2017 07:40:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB94428452 for ; Fri, 20 Jan 2017 07:40:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFF8128620; Fri, 20 Jan 2017 07:40:32 +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 7290A28452 for ; Fri, 20 Jan 2017 07:40:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 24E356EB5E; Fri, 20 Jan 2017 07:39:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.w1.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48F666EB49 for ; Fri, 20 Jan 2017 07:39:04 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OK200DD8IL2JY50@mailout3.w1.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 20 Jan 2017 07:39:02 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170120073901eucas1p1816873eac66a8e21a52c5b628508390e~bas_Svn660246802468eucas1p1C; Fri, 20 Jan 2017 07:39:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id A3.B0.16908.89EB1885; Fri, 20 Jan 2017 07:39:04 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170120073901eucas1p134403a09cc3ac008c9a3285b31aef888~bas9o_RXR0433104331eucas1p1o; Fri, 20 Jan 2017 07:39:01 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-05-5881be98ff0c Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D9.08.06687.0DEB1885; Fri, 20 Jan 2017 07:40:00 +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:39:01 +0000 (GMT) From: Andrzej Hajda To: Archit Taneja , dri-devel@lists.freedesktop.org Subject: [PATCH 20/24] drm/bridge/sii8620: send EMSC features on request Date: Fri, 20 Jan 2017 08:38:46 +0100 Message-id: <1484897930-1275-21-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+NgFtrNIsWRmVeSWpSXmKPExsWy7djPc7oz9jVGGJx6zW9xa905Voumjres FhtnrGe1uPL1PZvFpPsTWCzWHrnL7sDmcbmvl8njfvdxJo++LasYA5ijuGxSUnMyy1KL9O0S uDL2Tt3BVLBSomLynooGxnmiXYycHBICJhKvmw+zQ9hiEhfurWfrYuTiEBJYxijxp/ckK4Tz mVGic8YcNpiOxz9ns8JV3Wx/wATh/GeUWHzpBStIFZuApsTfzTfBOkQEvCXmrO5jBLGZBdYz Slw7FQdiCwt4SPR+2w9WzyKgKnFl8nZmEJtXwFni1fX1rBDb5CRunusEi3MCxc/f+AK2TELg NpvEvAX9QAkOIEdWYtMBZoh6F4mrna+gbGGJV8e3QP0mI9HZcRCqt5tR4lP/CXYIZwqjxL8P M6A6rCUOH7/ICnEpn8SkbdOhFvBKdLQJQZgeEmtvp0BUO0qsuXuSGeL5aYwSM9uvMk9glFnA yLCKUSS1tDg3PbXYUK84Mbe4NC9dLzk/dxMjMEpP/zv+fgfj0+aQQ4wCHIxKPLw7TjRECLEm lhVX5h5ilOBgVhLh7VnfGCHEm5JYWZValB9fVJqTWnyIUZqDRUmcd++CK+FCAumJJanZqakF qUUwWSYOTqkGxnX/g9ce27FYV2SuyO21nEFvrFbMPfSCf/aZZbN5uCZafX2ivm3+3LfdU1W7 35+v+7503qOt5ed2xb+ue7Myp/K/FVthj/YJG+6+yG0s/Y0f84SWlU458mDJWVb/mi/Wt9Z0 hzP0/avSlFLOq3kaP1GgOXL1678fpRQep6UtjruexPnPTm794RwlluKMREMt5qLiRACuAbp6 zgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJLMWRmVeSWpSXmKPExsVy+t/xy7oX9jVGGEyYKWBxa905Voumjres FhtnrGe1uPL1PZvFpPsTWCzWHrnL7sDmcbmvl8njfvdxJo++LasYA5ij3GwyUhNTUosUUvOS 81My89JtlUJD3HQtlBTyEnNTbZUidH1DgpQUyhJzSoE8IwM04OAc4B6spG+X4Jaxd+oOpoKV EhWT91Q0MM4T7WLk5JAQMJF4/HM2K4QtJnHh3no2EFtIYAmjxM89dV2MXEB2I5PEtn/TwIrY BDQl/m6+CVYkIuAtMWd1HyNIEbPAekaJqY//soMkhAU8JHq/7QdrYBFQlbgyeTsziM0r4Czx 6vp6qG1yEjfPdYLFOYHi5298Yepi5ADa5iRxbZbsBEbeBYwMqxhFUkuLc9Nziw31ihNzi0vz 0vWS83M3MQKDdduxn5t3MF7aGHyIUYCDUYmHN+FYQ4QQa2JZcWXuIUYJDmYlEd6e9Y0RQrwp iZVVqUX58UWlOanFhxhNgW6ayCwlmpwPjKS8knhDE0NzS0MjYwsLcyMjJXHekg9XwoUE0hNL UrNTUwtSi2D6mDg4pRoYk8p3XekzkCytUJ2f/nCyZrZwNYeInEvm+s8cqR9CYwIOH/3EXrtx 857kqyX3duxsb0g7+MT1N7P2tHk24SqnjjwXvL+KYf1vr++Xvgjekn8Tl7PIrNLTqa6kJC91 15sw33urzfzSnXf6TXpdIBvSElza2Refc23Vf9a+WZO700xeLzuWZpqvxFKckWioxVxUnAgA IvxIFmwCAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170120073901eucas1p134403a09cc3ac008c9a3285b31aef888 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: 20170120073901eucas1p134403a09cc3ac008c9a3285b31aef888 X-RootMTR: 20170120073901eucas1p134403a09cc3ac008c9a3285b31aef888 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 Device should report to the peer which features are really supported. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/bridge/sil-sii8620.c | 27 +++++++++++++++++++++++---- drivers/gpu/drm/bridge/sil-sii8620.h | 16 ++++++++-------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 2c7b5b9..2cc197d 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -1644,6 +1644,25 @@ static void sii8620_got_ecbus_speed(struct sii8620 *ctx, int ret) sii8620_mt_set_cont(ctx, sii8620_ecbus_up); } +static void sii8620_mhl_burst_emsc_support_set(struct mhl_burst_emsc_support *d, + enum mhl_burst_id id) +{ + sii8620_mhl_burst_hdr_set(&d->hdr, MHL_BURST_ID_EMSC_SUPPORT); + d->num_entries = 1; + d->burst_id[0] = cpu_to_be16(id); +} + +static void sii8620_send_features(struct sii8620 *ctx) +{ + u8 buf[16]; + + sii8620_write(ctx, REG_MDT_XMIT_CTRL, BIT_MDT_XMIT_CTRL_EN + | BIT_MDT_XMIT_CTRL_FIXED_BURST_LEN); + sii8620_mhl_burst_emsc_support_set((void *)buf, + MHL_BURST_ID_HID_PAYLOAD); + sii8620_write_buf(ctx, REG_MDT_XMIT_WRITE_PORT, buf, ARRAY_SIZE(buf)); +} + static void sii8620_msc_mr_set_int(struct sii8620 *ctx) { u8 ints[MHL_INT_SIZE]; @@ -1664,10 +1683,10 @@ static void sii8620_msc_mr_set_int(struct sii8620 *ctx) break; } } - if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_REQ) { - sii8620_mt_set_int(ctx, MHL_INT_REG(RCHANGE), - MHL_INT_RC_FEAT_COMPLETE); - } + if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_REQ) + sii8620_send_features(ctx); + if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_COMPLETE) + sii8620_edid_read(ctx, 0); } static struct sii8620_mt_msg *sii8620_msc_msg_first(struct sii8620 *ctx) diff --git a/drivers/gpu/drm/bridge/sil-sii8620.h b/drivers/gpu/drm/bridge/sil-sii8620.h index aefae67..e42c1c3 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.h +++ b/drivers/gpu/drm/bridge/sil-sii8620.h @@ -1298,14 +1298,14 @@ /* MDT Transmit Control, default value: 0x70 */ #define REG_MDT_XMIT_CTRL 0x0588 -#define BIT_MDT_XMIT_CTRL_MDT_XMIT_EN BIT(7) -#define BIT_MDT_XMIT_CTRL_MDT_XMIT_CMD_MERGE_EN BIT(6) -#define BIT_MDT_XMIT_CTRL_MDT_XMIT_FIXED_BURST_LEN BIT(5) -#define BIT_MDT_XMIT_CTRL_MDT_XMIT_FIXED_AID BIT(4) -#define BIT_MDT_XMIT_CTRL_MDT_XMIT_SINGLE_RUN_EN BIT(3) -#define BIT_MDT_XMIT_CTRL_MDT_CLR_ABORT_WAIT BIT(2) -#define BIT_MDT_XMIT_CTRL_MDT_XFIFO_CLR_ALL BIT(1) -#define BIT_MDT_XMIT_CTRL_MDT_XFIFO_CLR_CUR BIT(0) +#define BIT_MDT_XMIT_CTRL_EN BIT(7) +#define BIT_MDT_XMIT_CTRL_CMD_MERGE_EN BIT(6) +#define BIT_MDT_XMIT_CTRL_FIXED_BURST_LEN BIT(5) +#define BIT_MDT_XMIT_CTRL_FIXED_AID BIT(4) +#define BIT_MDT_XMIT_CTRL_SINGLE_RUN_EN BIT(3) +#define BIT_MDT_XMIT_CTRL_CLR_ABORT_WAIT BIT(2) +#define BIT_MDT_XMIT_CTRL_XFIFO_CLR_ALL BIT(1) +#define BIT_MDT_XMIT_CTRL_XFIFO_CLR_CUR BIT(0) /* MDT Receive WRITE Port, default value: 0x00 */ #define REG_MDT_XMIT_WRITE_PORT 0x0589