From patchwork Fri Oct 26 10:40:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10657201 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 ACB3314DE for ; Fri, 26 Oct 2018 10:40:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DF2E2BE46 for ; Fri, 26 Oct 2018 10:40:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8049E2C291; Fri, 26 Oct 2018 10:40:14 +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 BA39A2BE46 for ; Fri, 26 Oct 2018 10:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726493AbeJZTQq (ORCPT ); Fri, 26 Oct 2018 15:16:46 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47701 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbeJZTQq (ORCPT ); Fri, 26 Oct 2018 15:16:46 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181026104010euoutp02fb6928fd8411fbcc7659d99ce755a991~hIm-CDeGI0512005120euoutp02c; Fri, 26 Oct 2018 10:40:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20181026104010euoutp02fb6928fd8411fbcc7659d99ce755a991~hIm-CDeGI0512005120euoutp02c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1540550410; bh=lvMJ+KhptiSJk1p4bsULq1W6REswqy+zvSMJp9l1mDo=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=NXfUpqJvEVN265/6/Azu+MPEPrpiR433IAh8VBFjVL7yY6q3/9x8/94gwBL4Ft/fj Rl1w2jBWJTGLKXHhRZdXmd1X7kiPXGJ3B79ZXBD+KG0ZkyjVIExa2wRCh2k+vPRdy8 azhOF75HJ26COFjcJt4TQ78pgZAE+wPpBKK7J4Xs= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181026104010eucas1p2170271603276fbe9393394d8d68ab083~hIm_fEbTS1537515375eucas1p2R; Fri, 26 Oct 2018 10:40:10 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 8E.47.04441.90FE2DB5; Fri, 26 Oct 2018 11:40:10 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181026104009eucas1p106dab69d3da0a9fc3381f45fb8c02989~hIm9kDMRf1534115341eucas1p1J; Fri, 26 Oct 2018 10:40:09 +0000 (GMT) X-AuditID: cbfec7f2-5c9ff70000001159-c0-5bd2ef0967f9 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 2C.07.04284.90FE2DB5; Fri, 26 Oct 2018 11:40:09 +0100 (BST) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PH7004T3CAWJD50@eusync4.samsung.com>; Fri, 26 Oct 2018 11:40:09 +0100 (BST) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/2] drm/exynos/dsi: register connector if it is created after drm bind Date: Fri, 26 Oct 2018 12:40:03 +0200 Message-id: <20181026104003.30736-1-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+NgFprJIsWRmVeSWpSXmKPExsWy7djPc7pc7y9FGzywsri17hyrxcYZ61kt rnx9z2Yx6f4EFosZ5/cxWaw9cpfdgc3jfvdxJo++LasYPT5vkgtgjuKySUnNySxLLdK3S+DK mLn7B2vBZYGKE1cOszQwzubrYuTkkBAwkbh0cw5jFyMXh5DACkaJH5cWskM4nxklzvTtAHI4 wKqm/q6DiC9jlPi/4wwLhPOfUeLpnkZ2kFFsApoSfzffZAOxRQSUJVbtawebxCxwiVHi6DaI ImGBGInOp5MYQWwWAVWJB3emM4PYvAIWEt/7rzND3CQv8fB4OyPIZk4BS4nVzZwgcyQEPrJK rL/3kxWixkXiXP9OFghbWOLV8S3sELaMRGfHQSYIu16iaeYVZojmDkaJE4uXs0EkrCUOH78I NohZgE9i0jaQI0De5JXoaBOCKPGQeLymG+rLHkaJzl0z2SYwSi5gZFjFKJ5aWpybnlpsmJda rlecmFtcmpeul5yfu4kRGGGn/x3/tIPx66WkQ4wCHIxKPLwTvl2MFmJNLCuuzD3EKMHBrCTC 6/fiUrQQb0piZVVqUX58UWlOavEhRmkOFiVx3mXzNkYLCaQnlqRmp6YWpBbBZJk4OKUaGCOW yJneU9ho+FZ99SlFj8PVR4522MzgeVHx04trl90/hncWJ8R607cXLpEunsvD3MU1XVF5Z+Fh 19lPrrMt5l1a1G4eVVF46fMTWUZ54aw9S5QkfDa23Wnu5emdnhweWZP9xoplYlGAVDzfI8Y9 c/RL1KdP/x/ZXlCzy3uCgf3k+axOM+pqlViKMxINtZiLihMBPl5GvqwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xa7qc7y9FG0x8I2xxa905VouNM9az Wlz5+p7NYtL9CSwWM87vY7JYe+QuuwObx/3u40wefVtWMXp83iQXwBzFZZOSmpNZllqkb5fA lTFz9w/WgssCFSeuHGZpYJzN18XIwSEhYCIx9XddFyMnh5DAEkaJm5Ntuxi5gOxGJoknnTfY QRJsApoSfzffZAOxRQSUJVbta2cHKWIWuMIoseHUS7CEsECMROfTSYwgNouAqsSDO9OZQWxe AQuJ7/3XwWwJAXmJh8fbGUEWcwpYSqxu5oRYbCFx6cs/pgmMPAsYGVYxiqSWFuem5xYb6hUn 5haX5qXrJefnbmIEhsa2Yz8372C8tDH4EKMAB6MSD++EbxejhVgTy4orcw8xSnAwK4nw+r24 FC3Em5JYWZValB9fVJqTWnyIUZqDRUmc97xBZZSQQHpiSWp2ampBahFMlomDU6qBUdquSYY/ xE6I59/ExLnNQT1/42VMhfv4ViYuK8rZP2/2DlvpzasddDtM6/zaef8ZO3WE7et80y3we7Xn l/mLBbqkvzBLZwndjM6pfb6tQW2h631NqwdH9gto2BwUfLm99UYgs/CvRc+ZZW5vvHn40CSv fDf7miu8K7YwBvW8MPy7/vKpqpVKSizFGYmGWsxFxYkAtrK8ngkCAAA= X-CMS-MailID: 20181026104009eucas1p106dab69d3da0a9fc3381f45fb8c02989 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181026104009eucas1p106dab69d3da0a9fc3381f45fb8c02989 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 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 Tested-by: Marek Szyprowski --- Hi, During just-before-send adjustements I have made horrible typo so there is v2. v2: - fixed if condition --- 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..ef5f19b084a6 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; }