From patchwork Fri Oct 26 10:13:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10657189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E439109C for ; Fri, 26 Oct 2018 10:13:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 463442BF84 for ; Fri, 26 Oct 2018 10:13:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38B452C217; Fri, 26 Oct 2018 10:13:44 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D83F2BF84 for ; Fri, 26 Oct 2018 10:13:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726493AbeJZSuL (ORCPT ); Fri, 26 Oct 2018 14:50:11 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:55543 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726278AbeJZSuK (ORCPT ); Fri, 26 Oct 2018 14:50:10 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181026101340euoutp018e77051b3302b51fc1438d73a2461a1a~hIP1rcogG3209932099euoutp01u; Fri, 26 Oct 2018 10:13:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181026101340euoutp018e77051b3302b51fc1438d73a2461a1a~hIP1rcogG3209932099euoutp01u DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1540548820; bh=g7/sUP3SKatOmYI32rF45NfBx2PiPjbvBQUJjo4okWE=; h=From:To:Cc:Subject:Date:References:From; b=oUh9D9MIRO0st8HPRSiz/6b1CeaCPfnH/wZiLUr556q1qucZWx69o9h2e7e2SWoIx DtEeEyw/61PkzEf9xJ644f2ntbU0I3BLgEWSdT1LdNTlLH+TLzSxgbfEJVw51YEwUT 9y//1ymotVRldnvb7ry3eQW0tCK5Sg55ceEzPvxc= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181026101339eucas1p2216cdb64ec8ee5e5cd84d24306c55fe9~hIP07nzpR2414224142eucas1p2m; Fri, 26 Oct 2018 10:13:39 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id D8.11.04806.3D8E2DB5; Fri, 26 Oct 2018 11:13:39 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181026101338eucas1p25223f6f9db66982fae0f7adfd8a417fc~hIP0BP_B22054020540eucas1p2l; Fri, 26 Oct 2018 10:13:38 +0000 (GMT) X-AuditID: cbfec7f5-34dff700000012c6-d5-5bd2e8d37f07 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id DB.85.04128.2D8E2DB5; Fri, 26 Oct 2018 11:13:38 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PH700KN3B2PZ140@eusync3.samsung.com>; Fri, 26 Oct 2018 11:13:38 +0100 (BST) From: Andrzej Hajda To: Inki Dae Cc: linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski Subject: [PATCH 1/2] drm/exynos/dsi: register connector if it is created after drm bind Date: Fri, 26 Oct 2018 12:13:27 +0200 Message-id: <20181026101328.26242-1-a.hajda@samsung.com> X-Mailer: git-send-email 2.18.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42LZduzned3LLy5FG+y6xmFxa905VouNM9az Wlz5+p7NYtL9CSwWM87vY7JYe+QuuwObx/3u40wefVtWMXp83iQXwBzFZZOSmpNZllqkb5fA lXF5xQSWghv8FVPvyzQw7uXtYuTkkBAwkfj8ZQ97FyMXh5DACkaJru/3GSGcz4wS2x8tY4ep uvPkGiOILSSwjFHi5vNgiKL/jBK/F60CS7AJaEr83XyTDcQWEVCWWLWvHWwss8AlRok1V0G6 OTiEBSIlOtb4gNSwCKhKPDi8D2wBr4CFRM+lH1DL5CUeHm8Hu0JC4CarxJQVB1ghEi4SK7sn skHYwhKvjm+BapCRuDy5mwXCrpdomnmFGaK5g1HixOLlUA3WEoePXwQbxCzAJzFp23RmkIMk BHglOtqEIEo8JKbse8QE8WWsxM724ywTGCUWMDKsYhRPLS3OTU8tNs5LLdcrTswtLs1L10vO z93ECIyj0/+Of93BuO9P0iFGAQ5GJR7eCd8uRguxJpYVV+YeYpTgYFYS4fUDRqEQb0piZVVq UX58UWlOavEhRmkOFiVx3mXzNkYLCaQnlqRmp6YWpBbBZJk4OKUaGDdEF6lFH8iN/1o/58XV auWvWoayh89UBc86dnbjjY/hQWtrVX/+/bjJlV1bJe9MyMIbPJltdaxGvd6LxHts5Jfbveuf eCr9x7GOYyHafas27WIWXHLkTVXKXq0HhRvfL+5K+HlvyvG95hoW0869bgqRfsG846ryw96Q K72RUUG9778uMrzNrqTEUpyRaKjFXFScCAC8sXgqnwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrAJMWRmVeSWpSXmKPExsVy+t/xq7qXXlyKNrhyQMHi1rpzrBYbZ6xn tbjy9T2bxaT7E1gsZpzfx2Sx9shddgc2j/vdx5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6B K+PyigksBTf4K6bel2lg3MvbxcjJISFgInHnyTXGLkYuDiGBJYwS95a/YIFwGpkkfh3vZQGp YhPQlPi7+SYbiC0ioCyxal87O0gRs8AVRonfFyYwgSSEBSIlblw/wgpiswioSjw4vI8dxOYV sJDoufSDHWKdvMTD4+2MExi5FjAyrGIUSS0tzk3PLTbSK07MLS7NS9dLzs/dxAj097ZjP7fs YOx6F3yIUYCDUYmHd8K3i9FCrIllxZW5hxglOJiVRHiLrl2KFuJNSaysSi3Kjy8qzUktPsQo zcGiJM573qAySkggPbEkNTs1tSC1CCbLxMEp1cAoe9SL/egC0/PPn3bMZtm67mHQ5AfRD6QW WzOX1Ra6GD+UUu9focNlINfpwHOcf+p/j9jvi7Vblp2yrDz1xrLzd4SDToL7Wvm1/J0X7q7y 59slEf7cMkrd69c+o77vbq8d9yVcZdDg5JJ7HXHh2ePApkk3zkVuOR/7XqZH7Ac7g7OUa5qA ZZQSS3FGoqEWc1FxIgBgq9OM8wEAAA== X-CMS-MailID: 20181026101338eucas1p25223f6f9db66982fae0f7adfd8a417fc X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181026101338eucas1p25223f6f9db66982fae0f7adfd8a417fc References: Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DSI device can be attached after DRM device is registered. In such case newly created connector must be registered by exynos_dsi. The patch fixes exynos_drm on rinato and trats boards. Fixes: 6afb7721e2a0 ("drm/exynos: move connector creation to attach callback") Reported-by: Marek Szyprowski Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 07af7758066d..e7a4717d2cb6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -1474,12 +1475,12 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder) { struct exynos_dsi *dsi = encoder_to_dsi(encoder); struct drm_connector *connector = &dsi->connector; + struct drm_device *drm = encoder->dev; int ret; connector->polled = DRM_CONNECTOR_POLL_HPD; - ret = drm_connector_init(encoder->dev, connector, - &exynos_dsi_connector_funcs, + ret = drm_connector_init(drm, connector, &exynos_dsi_connector_funcs, DRM_MODE_CONNECTOR_DSI); if (ret) { DRM_ERROR("Failed to initialize connector with drm\n"); @@ -1489,7 +1490,12 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder) connector->status = connector_status_disconnected; drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs); drm_connector_attach_encoder(connector, encoder); + if (drm->registered) + return 0; + connector->funcs->reset(connector); + drm_fb_helper_add_one_connector(drm->fb_helper, connector); + drm_connector_register(connector); return 0; } From patchwork Fri Oct 26 10:13:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10657193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F1425A4 for ; Fri, 26 Oct 2018 10:13:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C7262BF84 for ; Fri, 26 Oct 2018 10:13:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 803D42C226; Fri, 26 Oct 2018 10:13:47 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31A4B2BF84 for ; Fri, 26 Oct 2018 10:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726796AbeJZSuP (ORCPT ); Fri, 26 Oct 2018 14:50:15 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:38368 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726278AbeJZSuO (ORCPT ); Fri, 26 Oct 2018 14:50:14 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181026101344euoutp02cc2fad15027c149ed2053c632cb8dc44~hIP5jfA5V2364623646euoutp02b; Fri, 26 Oct 2018 10:13:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181026101344euoutp02cc2fad15027c149ed2053c632cb8dc44~hIP5jfA5V2364623646euoutp02b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1540548824; bh=mQuATenWr0ZslzLIb5GIuRj/ujO5M44HUwGtQ9TUBj0=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=C3OIY848cpxCwyJAhsEmR8aWDLngJggAY+CrsyEo4V6aFpSec1EdKwlJpkqKN50W3 i5dIDVOPtTo+9HrbtzSVmUr+3pZhQPiasW98tGV8qLaRE8hzfQ/lNHtgn4RolWf3Ba VywA9upcgkKVsz9pgIqZiMNTJ1mQrvgG4IRl3odA= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181026101344eucas1p2659f7be097722257ab27282b151930b9~hIP5G0J1v1773017730eucas1p2x; Fri, 26 Oct 2018 10:13:44 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 1C.11.04806.7D8E2DB5; Fri, 26 Oct 2018 11:13:43 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181026101343eucas1p21bb8caff42737b8907527f5d1617e2b0~hIP4SMRQm2053920539eucas1p2m; Fri, 26 Oct 2018 10:13:43 +0000 (GMT) X-AuditID: cbfec7f5-367ff700000012c6-e3-5bd2e8d7cb59 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id BB.C3.04284.6D8E2DB5; Fri, 26 Oct 2018 11:13:42 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PH700KN3B2PZ140@eusync3.samsung.com>; Fri, 26 Oct 2018 11:13:42 +0100 (BST) From: Andrzej Hajda To: Inki Dae Cc: linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski Subject: [PATCH 2/2] drm/exynos/fbdev: do not skip fbdev init if there are no connectors Date: Fri, 26 Oct 2018 12:13:28 +0200 Message-id: <20181026101328.26242-2-a.hajda@samsung.com> X-Mailer: git-send-email 2.18.0 In-reply-to: <20181026101328.26242-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djPc7rXX1yKNji9Vtvi1rpzrBYbZ6xn tbjy9T2bxaT7E1gsZpzfx2Sx9shddgc2j/vdx5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6B K2NP6wqmgmMcFRsfHWZqYFzF3sXIySEhYCLxvWMWSxcjF4eQwApGiZbJTWwQzmdGicdTrjDC VDU0NTFBJJYxShw4f40FJCEk8J9RYvkZLxCbTUBT4u/mm2wgtoiAssSqfe3sIA3MApcYJdZc vQY2SVggSuLZ30nMIDaLgKrE8RvzweK8AhYS7cfXskJsk5d4eLwdKM7BwSlgKbG6mRNkjoTA R1aJQ60noC5ykXj58gMzhC0s8er4Fqh/ZCQ6Ow4yQdj1Ek0zrzBDNHcwSpxYvJwNImEtcfj4 RbBlzAJ8EpO2TWcGWSYhwCvR0SYEUeIh8efdEWi49DBKLHxwmHUCo+QCRoZVjOKppcW56anF xnmp5XrFibnFpXnpesn5uZsYgTF2+t/xrzsY9/1JOsQowMGoxMM74dvFaCHWxLLiytxDjBIc zEoivH7ACBXiTUmsrEotyo8vKs1JLT7EKM3BoiTOu2zexmghgfTEktTs1NSC1CKYLBMHp1QD o2yFbMy1Be8ZfD6eahE+NTX8dr5w8O7UVf46Hf/UF3rE3kpOuZS9+MoR4UKOuGYTlsnRQa1M 7zdsPLYyW7Rl637NuWue2d9d/dvIOFed6e6cuwEhJnYPb7QL3mKUaOjb0NrHe/n7H421Vos9 cls+J1xRvXX92UU+Zf/jWXtCS1d+v+PWOmtLihJLcUaioRZzUXEiABEB0watAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7rXXlyKNjj9wMji1rpzrBYbZ6xn tbjy9T2bxaT7E1gsZpzfx2Sx9shddgc2j/vdx5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6B K2NP6wqmgmMcFRsfHWZqYFzF3sXIySEhYCLR0NTE1MXIxSEksIRRYtLHhWwQTiOTxN+nE1lB qtgENCX+br7JBmKLCChLrNrXzg5SxCxwhVHi94UJTCAJYYEoiWcHToE1sAioShy/MZ8RxOYV sJBoP76WFWKdvMTD4+1AcQ4OTgFLidXNnCBhIaCSS1/+MU1g5FnAyLCKUSS1tDg3PbfYUK84 Mbe4NC9dLzk/dxMjMDy2Hfu5eQfjpY3BhxgFOBiVeHgnfLsYLcSaWFZcmXuIUYKDWUmEt+ja pWgh3pTEyqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotgskwcnFINjKZfmZ8u f9Wo3lDq93vvrpteLC6zGnkF53/Uuq+y1n6G27m+C8W/M2pn3dn4/8XlK7OCDWTeci331U4/ k/b/2pUj0govVgoEymxpM9E55piUfjavMC0xZu3q2xMXJMve/9cqPTPdKYvzpuJn7Rpv9lf+ z5a773rEHP6gKyXQhHtJgrF5sMpPLSWW4oxEQy3mouJEAGwbpGoLAgAA X-CMS-MailID: 20181026101343eucas1p21bb8caff42737b8907527f5d1617e2b0 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181026101343eucas1p21bb8caff42737b8907527f5d1617e2b0 References: <20181026101328.26242-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since connectors can be created dynamically, fbdev should be initialized even if there are no connectors at the moment. Otherwise fbdev will not be created even after connector's appearance. The patch fixes lack of fbdev on rinato and trats boards. Fixes: 6afb7721e2a0 ("drm/exynos: move connector creation to attach callback") Reported-by: Marek Szyprowski Signed-off-by: Andrzej Hajda Tested-by: Marek Szyprowski --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 918dd2c82209..01d182289efa 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -192,7 +192,7 @@ int exynos_drm_fbdev_init(struct drm_device *dev) struct drm_fb_helper *helper; int ret; - if (!dev->mode_config.num_crtc || !dev->mode_config.num_connector) + if (!dev->mode_config.num_crtc) return 0; fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);