From patchwork Wed Jul 8 10:35:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 235066 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp310036ilg; Wed, 8 Jul 2020 03:36:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPZ6NrWNGCD7laJU2meYoD57W3XN6p3JkU5p9WnebYd6CKqCfxbF4N2v4sbVBt/v0EmfWk X-Received: by 2002:aa7:d650:: with SMTP id v16mr66044370edr.361.1594204602058; Wed, 08 Jul 2020 03:36:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594204602; cv=none; d=google.com; s=arc-20160816; b=F7R+xGfUe98jiQArodhDZ5RS49q/rfMmrAklZie1olL8uFmuY2zq1MKtMTqAXC9FbH wb0mTosbZiEhYEwm+kM2reb9AYd18WNWiMYPr2HNvMtjgDnn8eN5xhieXxd7lPfvwwmo bCnOXDDl8LD1dZY73u/NYPybJl+TkoHi5fGyKE+4GJXFoDCBTb6mZsceMpo5XyEKzlZ/ 8mIkijs/u7Cqz89mfcF08x33y/HGMG9TKOH59mYbZkjkaNx4Vi6SW7YI61cVvJ3H1nin 8eMxLIO14u3sjb15Ee7SEW0MQKYipl74ViGIuhlwyRHWHNBLik5G+lenG51RK/RD5wMX Ui1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kwJr06VZjw3DL1EB9ESLQFHEbo/wSdiyOPyY81ydWOA=; b=n+gKnS/aM83eVL/QDRbGySngaFIjyMo8v1rdtDckPw1wCuhAXpSjuxEPAyTIJz7GYy VhieVqFbgDj2zSqAcSAQ9T2hGjAnWWfAOBX682JadvV8kx5aVH5RbS2P6k8euQ0FoZEc 7b9RkRba5vHvC6HZ5H/z0ysn8GDY0gJje3VA+dM/1TUlILfyln8kq8lrHKUCz5Vxqw2f yfTFeYzQePmUCRc+As27wEWZ476QDETirRLZMRf7BZo4rIltCdSoeJbl3mUcNOu3d2un ha0Jaqx5u2OVUjC6TBTZwoYiHclMhqGtNRnsQqT9ld40tCCcSbSzoFpAIEtcuflBoRjr IZHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZDKZQEcU; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w13si15713677ejj.564.2020.07.08.03.36.41; Wed, 08 Jul 2020 03:36:42 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZDKZQEcU; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728461AbgGHKgl (ORCPT + 6 others); Wed, 8 Jul 2020 06:36:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:35600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbgGHKgk (ORCPT ); Wed, 8 Jul 2020 06:36:40 -0400 Received: from localhost.localdomain (unknown [122.182.251.219]) (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 82B3F20739; Wed, 8 Jul 2020 10:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594204600; bh=rIwQJ9XgMhIS4v7G1h7P96EkZRD4YP9JPOfTgw+cIoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDKZQEcUJJSbA9ts791OUADunpuwx3rXhwxrMP47sJ7oVKHJWsZyWT1vX/l5Z0nzU P7uewMloYuQdCXniGQYU4bMvTIEZ+e5Hl3ScB9hxKYDURm9C21Tb6ofTaXk8eUgY9u 5z82uE0M2hgBeHJ4MeOOkIOh+FzPBpjtZhDJdAtg= From: Vinod Koul To: Daniel Vetter , David Airlie , Rob Clark Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Emil Velikov , Sam Ravnborg , John Stultz Subject: [PATCH v5 4/4] drm/msm/dsi: attach external bridge with DRM_BRIDGE_ATTACH_NO_CONNECTOR Date: Wed, 8 Jul 2020 16:05:59 +0530 Message-Id: <20200708103559.132300-5-vkoul@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200708103559.132300-1-vkoul@kernel.org> References: <20200708103559.132300-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Modern bridges do not create the connector and expect the display driver to do so. Hence, create the drm connector in msm display driver and add use flag DRM_BRIDGE_ATTACH_NO_CONNECTOR to attach bridges Tested-by: John Stultz Signed-off-by: Vinod Koul --- drivers/gpu/drm/msm/dsi/dsi.c | 7 +------ drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 20 deletions(-) -- 2.26.2 diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 55ea4bc2ee9c..617075e3e3f0 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -219,12 +219,7 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } - /* - * check if the dsi encoder output is connected to a panel or an - * external bridge. We create a connector only if we're connected to a - * drm_panel device. When we're connected to an external bridge, we - * assume that the drm_bridge driver will create the connector itself. - */ + /* Initialize the internal panel or external bridge */ ext_bridge = msm_dsi_host_get_bridge(msm_dsi->host); if (ext_bridge) diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 4b363bd7ddff..72cfd0a8187b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -3,6 +3,7 @@ * Copyright (c) 2015, The Linux Foundation. All rights reserved. */ +#include #include "msm_kms.h" #include "dsi.h" @@ -689,7 +690,7 @@ struct drm_bridge *msm_dsi_manager_bridge_init(u8 id) bridge = &dsi_bridge->base; bridge->funcs = &dsi_mgr_bridge_funcs; - ret = drm_bridge_attach(encoder, bridge, NULL, 0); + ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); if (ret) goto fail; @@ -709,7 +710,6 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) struct drm_encoder *encoder; struct drm_bridge *int_bridge, *ext_bridge; struct drm_connector *connector; - struct list_head *connector_list; int_bridge = msm_dsi->bridge; ext_bridge = msm_dsi->external_bridge = @@ -717,22 +717,21 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) encoder = msm_dsi->encoder; - /* link the internal dsi bridge to the external bridge */ - drm_bridge_attach(encoder, ext_bridge, int_bridge, 0); - - /* - * we need the drm_connector created by the external bridge - * driver (or someone else) to feed it to our driver's - * priv->connector[] list, mainly for msm_fbdev_init() + /* link the internal dsi bridge to the external bridge and attach + * the connector, we are supporting DRM_BRIDGE_ATTACH_NO_CONNECTOR + * so always create connector */ - connector_list = &dev->mode_config.connector_list; + drm_bridge_attach(encoder, ext_bridge, int_bridge, DRM_BRIDGE_ATTACH_NO_CONNECTOR); - list_for_each_entry(connector, connector_list, head) { - if (drm_connector_has_possible_encoder(connector, encoder)) - return connector; + connector = drm_bridge_connector_init(dev, encoder); + if (IS_ERR(connector)) { + DRM_DEV_ERROR(dev->dev, "drm_bridge_connector_init failed: %ld\n", + PTR_ERR(connector)); + return ERR_PTR(-ENODEV); } - return ERR_PTR(-ENODEV); + drm_connector_attach_encoder(connector, msm_dsi->encoder); + return connector; } void msm_dsi_manager_bridge_destroy(struct drm_bridge *bridge)