From patchwork Wed Aug 11 23:52:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12432093 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E2594C4338F for ; Wed, 11 Aug 2021 23:51:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A242B6101D for ; Wed, 11 Aug 2021 23:51:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A242B6101D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A1A4C6E201; Wed, 11 Aug 2021 23:51:06 +0000 (UTC) Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F7A16E201; Wed, 11 Aug 2021 23:51:04 +0000 (UTC) Received: by mail-pj1-x102d.google.com with SMTP id bo18so6371525pjb.0; Wed, 11 Aug 2021 16:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IqetlxJQH0ljhEzbSRKQFzu7rZWHhAi/EdZURPQQ3To=; b=tKGMDYzvqsSm1bXhOeAsc4+dTrkzKeunk1S5y4XY4Lfq2+FDkkLNnnfdIcLClY5xG/ lnIODU/oy3SLUh9w0jS5WL9Em9jEtJj6NpusS2Ofet5pRAmv305sU9niN60cIpK8MgRZ bxHsHj6UM9jGg89cyB0CciRN0wG3oFW96QIjNY+SfFwapsK7Ha5uGbV148pZnD/1GPr8 5sVzo4rljImLP8LtYhImG0QBoj2dkO5gCV4i67emkf/4Qj9+AFT0qXTbFANtaY15cPP7 XRSKn3QXYNh144LUZVSaqkUd2XLSBBh8oUu7OxmGSnY2T1sau6xJ9atiIra8+CximkJl zEzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IqetlxJQH0ljhEzbSRKQFzu7rZWHhAi/EdZURPQQ3To=; b=cYDNWCAqOrD/mDyY2g0hZwqiqp66BlzAPPjS+D8tegBXJsoskw5e/MmoMkCoyjEsRU CXTdBYiqnl3Kx6RxcMcrWx0Dy5N4dd5R2atAT+7JHrkpCy/l1IsVukHcyP8vSnM26hfr sjjbGZzugzph+ZwIs8uT4XBCCP8wHLmZMlC4kJMiY+XlF1IoK7YQBqMHDQR15kLvHmpu lRHamJnlXGVSXBUTvc4jy4w7PGUDYfwcVtLqmTLF6B+qmqsQzeAcFBEYQbvHVfDpx1os vg6Pr1a3UEGrmWqit2qneH0rhERbGnD52e5esORdZao3pLaGgUPhV6gM7Rx74Co443MM DHVw== X-Gm-Message-State: AOAM532wGbBNcksCgJKdKNCmKzCHN3fSITvoz7lZ1939wI7j5fqYr25i ByrmgkV0l9kPOnDvf6s+IkYaUFMT20cpUQ== X-Google-Smtp-Source: ABdhPJzRdBfwV7Mf9hAZec+YTQSgigWYzf3lb1xKO81xK8cSWjhr82Ro+zhTkBsFk5Vr9fhwW6n2Fw== X-Received: by 2002:a17:90a:6684:: with SMTP id m4mr13287665pjj.127.1628725863447; Wed, 11 Aug 2021 16:51:03 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id q1sm750673pfn.6.2021.08.11.16.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 16:51:02 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Laurent Pinchart , Stephen Boyd , Douglas Anderson , Rob Clark , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Jagan Teki , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/4] drm/bridge: ti-sn65dsi86: Avoid creating multiple connectors Date: Wed, 11 Aug 2021 16:52:47 -0700 Message-Id: <20210811235253.924867-2-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811235253.924867-1-robdclark@gmail.com> References: <20210811235253.924867-1-robdclark@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark If we created our own connector because the driver does not support the NO_CONNECTOR flag, we don't want the downstream bridge to *also* create a connector. And if this driver did pass the NO_CONNECTOR flag (and we supported that mode) this would change nothing. Fixes: 4e5763f03e10 ("drm/bridge: ti-sn65dsi86: Wrap panel with panel-bridge") Signed-off-by: Rob Clark Reported-by: Stephen Boyd Tested-by: Stephen Boyd Reviewed-by: Laurent Pinchart Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 9bf889302bcc..5d3b30b2f547 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -736,6 +736,9 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, } pdata->dsi = dsi; + /* We never want the next bridge to *also* create a connector: */ + flags |= DRM_BRIDGE_ATTACH_NO_CONNECTOR; + /* Attach the next bridge */ ret = drm_bridge_attach(bridge->encoder, pdata->next_bridge, &pdata->bridge, flags); From patchwork Wed Aug 11 23:52:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12432095 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EEF7FC4338F for ; Wed, 11 Aug 2021 23:51:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADEFB6101D for ; Wed, 11 Aug 2021 23:51:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ADEFB6101D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 825186E204; Wed, 11 Aug 2021 23:51:11 +0000 (UTC) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C8F56E203; Wed, 11 Aug 2021 23:51:08 +0000 (UTC) Received: by mail-pj1-x102b.google.com with SMTP id w13-20020a17090aea0db029017897a5f7bcso7726350pjy.5; Wed, 11 Aug 2021 16:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ajYbf81Yqy3WxYtrc+qNAd59M/DxRn0eX+jpAiWAdzU=; b=HFa/GpEZhGjw8e5u9UpZtdUaZYDPO2CUPmZsSq+o19AivoJl2fWAXdhJLHqwoU2Vbj pf+blzLQRJqfn6OKrZ7rZ9hFlKndZI7QB+4VDlmybyxpp65HOEwjPmnfWVEctyGnfgVC /KgKffkOHKtTyfKuQ3G5nDdjP7xBJcQYYlEppSLRxGTdveSrsvfHyHzD7qq2U+2bGI9D EaoFeDOBDuGbqjGtnbkkLnvtAbz3DE8P4ae8+Y2VyvLIdP4Tpo0/VND24bgkW1Nv3f62 Fj9Gb18fb6qwsNg3d6wn4HblHs4yo99aXnJEBr6hy5pbu8gh4Y9mUjnUaiJsikpIP8HS 9aeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ajYbf81Yqy3WxYtrc+qNAd59M/DxRn0eX+jpAiWAdzU=; b=VHzr8c8DOilQMmGHoPKVZ5RO4NiIYaoLCrvdBFM1AYjRRUW8ZDhF03aSm3YeXZRC/2 4jucC+Z9/t02zYiEPiCc527DDYJSvBqpIpy6BwN/Eb6ksccqk53Mx+fbJh5JIsV4ERat lbVP6FpHMn+dlCYOivjCia494OshuRgnu08IZmeENPAF/UFtKvs9lps1aTVF/ev5Ygxh wlSxDWQ3vhyyrhOP+QRvh5/L/2TsBpEPAu2iXbBnoXBiduM1+pK1oodRd/dfILWV8S4U 42qFj8Yt1Ud2qcbeTUSBMsN3nZ0LOmGPb/jMxTb/DHyqufM1QqaCZQU7pO89mSnia4aB qJ8Q== X-Gm-Message-State: AOAM532siLQ1aUFUvj21hKlhvBdyXj7vOXCU3fVIGdBEZgrSvHLi+h8y dbvi+X8+V4QbVgc9hgxqF9JPeKs0mOWwoQ== X-Google-Smtp-Source: ABdhPJytzYhLMXUKv84A3eQfW76ypTSusumRwm/ejokVZS9tslD/F13P648Qt7+qeAfTTfxweVZ69w== X-Received: by 2002:a17:902:7889:b029:12b:cf54:4bf1 with SMTP id q9-20020a1709027889b029012bcf544bf1mr1233174pll.85.1628725867120; Wed, 11 Aug 2021 16:51:07 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id 21sm714109pfh.103.2021.08.11.16.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 16:51:06 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Laurent Pinchart , Stephen Boyd , Douglas Anderson , Rob Clark , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Dmitry Baryshkov , Abhinav Kumar , Bjorn Andersson , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/4] drm/msm/dsi: Support NO_CONNECTOR bridges Date: Wed, 11 Aug 2021 16:52:48 -0700 Message-Id: <20210811235253.924867-3-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811235253.924867-1-robdclark@gmail.com> References: <20210811235253.924867-1-robdclark@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark For now, since we have a mix of bridges which support this flag, which which do *not* support this flag, or work both ways, try it once with NO_CONNECTOR and then fall back to the old way if that doesn't work. Eventually we can drop the fallback path. Signed-off-by: Rob Clark Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/msm/Kconfig | 2 ++ drivers/gpu/drm/msm/dsi/dsi_manager.c | 41 ++++++++++++++++++--------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index e9c6af78b1d7..36e5ba3ccc28 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -14,6 +14,8 @@ config DRM_MSM select REGULATOR select DRM_KMS_HELPER select DRM_PANEL + select DRM_BRIDGE + select DRM_PANEL_BRIDGE select DRM_SCHED select SHMEM select TMPFS diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index c41d39f5b7cf..1fd1cf93abbf 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -3,6 +3,8 @@ * Copyright (c) 2015, The Linux Foundation. All rights reserved. */ +#include "drm/drm_bridge_connector.h" + #include "msm_kms.h" #include "dsi.h" @@ -690,8 +692,7 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id) struct drm_device *dev = msm_dsi->dev; struct drm_encoder *encoder; struct drm_bridge *int_bridge, *ext_bridge; - struct drm_connector *connector; - struct list_head *connector_list; + int ret; int_bridge = msm_dsi->bridge; ext_bridge = msm_dsi->external_bridge = @@ -699,22 +700,36 @@ 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() + * Try first to create the bridge without it creating it's own + * connector.. currently some bridges support this, and others + * do not (and some support both modes) */ - connector_list = &dev->mode_config.connector_list; + ret = drm_bridge_attach(encoder, ext_bridge, int_bridge, + DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (ret == -EINVAL) { + struct drm_connector *connector; + struct list_head *connector_list; + + /* 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() + */ + connector_list = &dev->mode_config.connector_list; + + list_for_each_entry(connector, connector_list, head) { + if (drm_connector_has_possible_encoder(connector, encoder)) + return connector; + } - list_for_each_entry(connector, connector_list, head) { - if (drm_connector_has_possible_encoder(connector, encoder)) - return connector; + return ERR_PTR(-ENODEV); } - return ERR_PTR(-ENODEV); + return drm_bridge_connector_init(dev, encoder); } void msm_dsi_manager_bridge_destroy(struct drm_bridge *bridge) From patchwork Wed Aug 11 23:52:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12432097 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 43F90C4338F for ; Wed, 11 Aug 2021 23:51:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 03AB46052B for ; Wed, 11 Aug 2021 23:51:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 03AB46052B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DE866E20B; Wed, 11 Aug 2021 23:51:12 +0000 (UTC) Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BA636E203; Wed, 11 Aug 2021 23:51:10 +0000 (UTC) Received: by mail-pl1-x62c.google.com with SMTP id u15so2726655ple.2; Wed, 11 Aug 2021 16:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Fb0UCEpX2hncAMMM+CVKUm3ptCtK2quo6PKUWz1gmE=; b=KoNiW8+Jp1FOFuNjlM7BjA29+/t2rZrZlR5toKTQrNfCrsL5Db/Pc8SOGuRaMceY3F lAcabFH8poaSyRbqMK6WI+p2Pj8xbHJanhgbTKfobbpkxtilQqDyY1HvD+S5x5HU97LD XapVHT3sA9RJEhHicGmmAXhe8Rn4r4UceqVnb8te9UnvVBVgS/+ASqrvgwjXzglCIia1 TN4PbTXuUCvmDQpn+JFl+vqKyJrwAN/14JmdIISl0qnbQ80YiKjXHaU8w3CiSOS/qwm4 qDugD9sss262vQ6IHOavNfXsxpAfu6XnGqb3Yeob5aF/Ujty0Wk4buM/biQv34vjl+27 h/iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4Fb0UCEpX2hncAMMM+CVKUm3ptCtK2quo6PKUWz1gmE=; b=NNN30CCfnYJzcQ3yDiNunWpbqE7MQ5sppbq19066eDB9zSLcYbl1Fm4GlFXe9i55ye c2wA8IxqG727+wyr4KXNtmaHDBK9MFyrT+k7glFtCrCzL480EbZODw7rrHdwwfci/isV 68fFU4cfZzTfYnzZ3NtZOngAfa7Wf501RQ+y4T7m10fPcdtNV49GLGmywMOR1SgiUju4 CmQtgvgLPTumdMTzQnn8WTo0B8QvSMjqOFHi6740wgXVn6TzoMi1YDUfPcsFs1kocAUo rOS6r6DVn1k5fqvSo99iej6DnLuleuc+aSzfnsnpylkIvsSZFcFQphB97XROD34MBau7 KQLg== X-Gm-Message-State: AOAM533pvweweTkXAIoCLyVnIAh6qOamZuKKVmkVAX+Z6ajXqi+MhNh8 UmnVwTtKEXPWP0yOYO0OsbiUNDuZjhjEAg== X-Google-Smtp-Source: ABdhPJwO4Bx01d9wfp9gJdAKnj0Rh7KBf/4YtO0bD4U4QnLVZFytwRCFRg7H3VUCEIf+YQJVPDJ9Og== X-Received: by 2002:a62:78d0:0:b029:3dd:8fc1:2797 with SMTP id t199-20020a6278d00000b02903dd8fc12797mr1186803pfc.65.1628725869151; Wed, 11 Aug 2021 16:51:09 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id r9sm255420pfh.135.2021.08.11.16.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 16:51:08 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Laurent Pinchart , Stephen Boyd , Douglas Anderson , Rob Clark , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/4] drm/bridge: ti-sn65dsi86: Implement bridge->mode_valid() Date: Wed, 11 Aug 2021 16:52:49 -0700 Message-Id: <20210811235253.924867-4-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811235253.924867-1-robdclark@gmail.com> References: <20210811235253.924867-1-robdclark@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark For the brave new world of bridges not creating their own connectors, we need to implement the max clock limitation via bridge->mode_valid() instead of connector->mode_valid(). Signed-off-by: Rob Clark Reviewed-by: Douglas Anderson --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 5d3b30b2f547..38dcc49eccaf 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -595,6 +595,15 @@ static struct auxiliary_driver ti_sn_aux_driver = { .id_table = ti_sn_aux_id_table, }; +static enum drm_mode_status check_mode(const struct drm_display_mode *mode) +{ + /* maximum supported resolution is 4K at 60 fps */ + if (mode->clock > 594000) + return MODE_CLOCK_HIGH; + + return MODE_OK; +} + /* ----------------------------------------------------------------------------- * DRM Connector Operations */ @@ -616,11 +625,7 @@ static enum drm_mode_status ti_sn_bridge_connector_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { - /* maximum supported resolution is 4K at 60 fps */ - if (mode->clock > 594000) - return MODE_CLOCK_HIGH; - - return MODE_OK; + return check_mode(mode); } static struct drm_connector_helper_funcs ti_sn_bridge_connector_helper_funcs = { @@ -763,6 +768,14 @@ static void ti_sn_bridge_detach(struct drm_bridge *bridge) drm_dp_aux_unregister(&bridge_to_ti_sn65dsi86(bridge)->aux); } +static enum drm_mode_status +ti_sn_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) +{ + return check_mode(mode); +} + static void ti_sn_bridge_disable(struct drm_bridge *bridge) { struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge); @@ -1118,6 +1131,7 @@ static void ti_sn_bridge_post_disable(struct drm_bridge *bridge) static const struct drm_bridge_funcs ti_sn_bridge_funcs = { .attach = ti_sn_bridge_attach, .detach = ti_sn_bridge_detach, + .mode_valid = ti_sn_bridge_mode_valid, .pre_enable = ti_sn_bridge_pre_enable, .enable = ti_sn_bridge_enable, .disable = ti_sn_bridge_disable, From patchwork Wed Aug 11 23:52:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12432099 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 06CC0C4338F for ; Wed, 11 Aug 2021 23:51:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD2866052B for ; Wed, 11 Aug 2021 23:51:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BD2866052B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E3656E20F; Wed, 11 Aug 2021 23:51:16 +0000 (UTC) Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B40F6E207; Wed, 11 Aug 2021 23:51:12 +0000 (UTC) Received: by mail-pl1-x630.google.com with SMTP id k2so4830917plk.13; Wed, 11 Aug 2021 16:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=04WJj5s3tctrSwR8Sz6N1WyD9Un9NfxweT900BICdVM=; b=ne9DzUb+oQO4z6rDjwVGCE9QmlLYsujxft75FhYrqw6dKpJVnnuAf4c+a7U+3CE3Pp M3V3z9TSE50E4H12+sSkPYWgBiqNmOoMkuu+FNSVD/NZeWsuCd1cfMoFsyBB//ayEBs7 CuIy1Znix+tRa6+ApM51ahJCVzMkSVP/gmo31jYDk6A/WOM973ZXwqTw/Fr27pYWm5PT widI0YQHAsDmBpolqOAz/YkViZfW5A82VJAQlrge7gYXZWdPJBOis8uzM20JYDlnFvBl 2n/qcGeZfV7jPa0C87rAdjZyN98MpEVZ+U4qwM3wtDsSx52nbMtuu/9s0ffZQEHGJShG wmdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=04WJj5s3tctrSwR8Sz6N1WyD9Un9NfxweT900BICdVM=; b=hRGoWn/j2O9Ayzmo7XKrYEXI1orxQquicfhxqreNc5gCVdeUKY80infIOufmEf2PLz RLUnEBMn8ux19rQ6KaohlNORuVUNQmde/+z28YXPsuPKhZtyI3H7dzXBHgL4UsI4zgtD 553fsnjvVM30SIFYLeDuBgeahk9syz75+A51w87162NekIhO+GC1Y601pj32PpofRND1 dTTntkcTD1VkFcFAUZRcoI0FwJ8K94gLuEImYMSlKxTNl/p2C0RiC4+kU7U1ZKvgBYR9 MHtqdXMx10GTaxlxScXEUs/hPysCh49sTXg0B3fRrMuqNBa93kKqyFxtzaEcI1Es/cJ9 Z+Uw== X-Gm-Message-State: AOAM532qN7PjvArDGDOMuf2LWG8ZtBTFx2e2Z+ZBRUiQx+8UnB9EnQRJ 0cA6yR5VfNC5l77Pv7W8T5ZqiibKvIc9JQ== X-Google-Smtp-Source: ABdhPJw1q2RqS/5nMBmm9zC4l9pNzGk/XZcfLbMnn089P0iE1maQfoZnavDOwU1JF/CdkIXCuGM6Xw== X-Received: by 2002:a65:6441:: with SMTP id s1mr1164917pgv.214.1628725871203; Wed, 11 Aug 2021 16:51:11 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id j16sm727463pfi.165.2021.08.11.16.51.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 16:51:10 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Laurent Pinchart , Stephen Boyd , Douglas Anderson , Rob Clark , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/4] drm/bridge: ti-sn65dsi86: Add NO_CONNECTOR support Date: Wed, 11 Aug 2021 16:52:50 -0700 Message-Id: <20210811235253.924867-5-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210811235253.924867-1-robdclark@gmail.com> References: <20210811235253.924867-1-robdclark@gmail.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark Slightly awkward to fish out the display_info when we aren't creating own connector. But I don't see an obvious better way. Signed-off-by: Rob Clark Reviewed-by: Douglas Anderson --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 34 +++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 38dcc49eccaf..dc8112bab3d3 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -693,9 +693,11 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, return ret; } - ret = ti_sn_bridge_connector_init(pdata); - if (ret < 0) - goto err_conn_init; + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { + ret = ti_sn_bridge_connector_init(pdata); + if (ret < 0) + goto err_conn_init; + } /* * TODO: ideally finding host resource and dsi dev registration needs @@ -757,7 +759,8 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, err_dsi_attach: mipi_dsi_device_unregister(dsi); err_dsi_host: - drm_connector_cleanup(&pdata->connector); + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) + drm_connector_cleanup(&pdata->connector); err_conn_init: drm_dp_aux_unregister(&pdata->aux); return ret; @@ -806,9 +809,30 @@ static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata) regmap_write(pdata->regmap, SN_DSIA_CLK_FREQ_REG, val); } +/* + * Find the connector and fish out the bpc from display_info. It would + * be nice if we could get this instead from drm_bridge_state, but that + * doesn't yet appear to be the case. + */ static unsigned int ti_sn_bridge_get_bpp(struct ti_sn65dsi86 *pdata) { - if (pdata->connector.display_info.bpc <= 6) + struct drm_bridge *bridge = &pdata->bridge; + struct drm_connector_list_iter conn_iter; + struct drm_connector *connector; + unsigned bpc = 0; + + drm_connector_list_iter_begin(bridge->dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (drm_connector_has_possible_encoder(connector, bridge->encoder)) { + bpc = connector->display_info.bpc; + break; + } + } + drm_connector_list_iter_end(&conn_iter); + + WARN_ON(bpc == 0); + + if (bpc <= 6) return 18; else return 24;