From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8F1CC433E4 for ; Wed, 19 Aug 2020 11:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8EE5207BB for ; Wed, 19 Aug 2020 11:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597837777; bh=wBIBY+X1r1sF+0e8gMVmcy/w1ZZJwTcLyJ1eGkx0f2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KDc29Oj2ILq9iL0lyqd0oGbS4VISHZvu0h98qOquxzpegTVb8Ceod7UB1fQxV7WlS MbQSwYFm3JYJjlLl4gpntsevYIfp7mF+ODxR+chMOPLYl9m3WmrA5YrgSjnK7kSXEo 2p1fAIkz7hDHYMhDhY8SAzrE4sx7Af6FTYdbpLbs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728029AbgHSLtf (ORCPT ); Wed, 19 Aug 2020 07:49:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:47550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728139AbgHSLqy (ORCPT ); Wed, 19 Aug 2020 07:46:54 -0400 Received: from mail.kernel.org (ip5f5ad5a3.dynamic.kabel-deutschland.de [95.90.213.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4E28C22CA1; Wed, 19 Aug 2020 11:46:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597837582; bh=wBIBY+X1r1sF+0e8gMVmcy/w1ZZJwTcLyJ1eGkx0f2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CSTjrhyDFxcP+8lGmQba2qYPR7QD1P0fephC5gBk7kGQuE2xsLVqeeW+PUnBI+M0U IeVC0B/BqBbZstDI/kuYdQkKn9Bl489gM+03aDOtId+n5HWYj5F7Y8K3ooihlF3Dpb 6aTzONdLQ7IdIlMJiqsQrEYCh90joFRzjJpacQ1k= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k8MXs-00Euas-92; Wed, 19 Aug 2020 13:46:20 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , John Stultz , Manivannan Sadhasivam , Daniel Vetter , dri-devel , Xiubin Zhang , Liwei Cai , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 22/49] staging: hikey9xx/gpu: cleanup encoder attach logic Date: Wed, 19 Aug 2020 13:45:50 +0200 Message-Id: <6c864afac63d08385dd49bcab3cfd1b3c3430605.1597833138.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Place both adv7535 and panel logic at the same routine, cleaning up things a little bit and fixing the includes. Signed-off-by: Mauro Carvalho Chehab --- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c b/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c index cba81ee2639d..e904943d9f9e 100644 --- a/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +++ b/drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c @@ -25,7 +25,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -1483,17 +1484,31 @@ static const struct drm_encoder_funcs dw_encoder_funcs = { static int dw_drm_encoder_init(struct device *dev, struct drm_device *drm_dev, - struct drm_encoder *encoder) + struct drm_encoder *encoder, + struct drm_bridge *bridge) { int ret; - u32 crtc_mask = drm_of_find_possible_crtcs(drm_dev, dev->of_node); + u32 crtc_mask; + dev_info(dev, "%s:\n", __func__); + + /* Link drm_bridge to encoder */ + if (!bridge) { + DRM_INFO("no dsi bridge to attach the encoder\n"); + return 0; + } + + crtc_mask = drm_of_find_possible_crtcs(drm_dev, dev->of_node); if (!crtc_mask) { DRM_ERROR("failed to find crtc mask\n"); return -EINVAL; } + dev_info(dev, "Initializing CRTC encoder: %d\n", + crtc_mask); + encoder->possible_crtcs = crtc_mask; + encoder->possible_clones = 0; ret = drm_encoder_init(drm_dev, encoder, &dw_encoder_funcs, DRM_MODE_ENCODER_DSI, NULL); if (ret) { @@ -1503,7 +1518,14 @@ static int dw_drm_encoder_init(struct device *dev, drm_encoder_helper_add(encoder, &dw_encoder_helper_funcs); - return 0; + /* associate the bridge to dsi encoder */ + ret = drm_bridge_attach(encoder, bridge, NULL, 0); + if (ret) { + DRM_ERROR("failed to attach external bridge\n"); + drm_encoder_cleanup(encoder); + } + + return ret; } static int dsi_host_attach(struct mipi_dsi_host *host, @@ -1677,22 +1699,6 @@ static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) return 0; } -static int dsi_bridge_init(struct drm_device *dev, struct dw_dsi *dsi) -{ - struct drm_encoder *encoder = &dsi->encoder; - struct drm_bridge *bridge = dsi->bridge; - int ret; - - /* associate the bridge to dsi encoder */ - ret = drm_bridge_attach(encoder, bridge, NULL, 0); - if (ret) { - DRM_ERROR("failed to attach external bridge\n"); - return ret; - } - - return 0; -} - static int dsi_connector_get_modes(struct drm_connector *connector) { struct dw_dsi *dsi = connector_to_dsi(connector); @@ -1766,6 +1772,7 @@ static int dsi_connector_init(struct drm_device *dev, struct dw_dsi *dsi) if (ret) return ret; + dev_info(dev->dev, "Attaching CRTC encoder\n"); ret = drm_connector_attach_encoder(connector, encoder); if (ret) return ret; @@ -1784,16 +1791,13 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) struct drm_device *drm_dev = data; int ret; - ret = dw_drm_encoder_init(dev, drm_dev, &dsi->encoder); + DRM_INFO("dsi_bind\n"); + + ret = dw_drm_encoder_init(dev, drm_dev, &dsi->encoder, + dsi->bridge); if (ret) return ret; - if (dsi->bridge) { - ret = dsi_bridge_init(drm_dev, dsi); - if (ret) - return ret; - } - if (dsi->panel) { ret = dsi_connector_init(drm_dev, dsi); if (ret) -- 2.26.2