From patchwork Mon Apr 27 08:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CB0C912 for ; Mon, 27 Apr 2020 08:19:13 +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 6B27E20661 for ; Mon, 27 Apr 2020 08:19:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ogN9nME0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B27E20661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81FC189FA9; Mon, 27 Apr 2020 08:19:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BAE889FC8 for ; Mon, 27 Apr 2020 08:19:04 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id j3so16558817ljg.8 for ; Mon, 27 Apr 2020 01:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kIuVBt97T5UczkNuF9X+lkh6xTeNv+7Pk07BQ4VWNXw=; b=ogN9nME0rmrlQewxQUx8bjhBhZwHwkyNI1+ZssHlM6LHCT03fzoucJBy+bxB21ygkl bxXuOpPQU/TRJbpQEgO2mK5+a07pbFUCL5guS/zYUL111dZo09+MxSBJSlO9ECkSxjqE zkOJWnhIgEgrTkxSW8DSSgayOJ8sTUCBBEfZ/pAT0Q56injXIWfrN4pHAmWjAXReRGi0 HwT2ryVQxKgVgo7XDr/PrwBWLNhDXA5lHYEh2KNJE7UCTVgFcTlC4GbzaRwXDpHlVEsO LlrqgdurtOUAXp9H8V4SPVEVjrWmT8OgAF+W7wK/OvaennZT2OVUkeg+5IU0TydzhqOV /ylg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kIuVBt97T5UczkNuF9X+lkh6xTeNv+7Pk07BQ4VWNXw=; b=LTy+qW6VnoonDwMbGts3f9XdTw382fTzfiPwnR0z/xBkTWX/aEklbpnbqiL5QjbB0/ DR0fn20v7WtJQ6vqIilXFMxckWkkw8F6hsWCTEFOCqe1KOv6JZUJ3udvq3eKvZxMBaA9 Gjuyw/clyt+1lU79N874EJHhxPrMnUpdO30Ng/v/MSOSwEbt4hG7pw9o60ItXQVh2K3l vhvQv/L5UlS0R1a6+X9o2bw152HiD9+opaHseRy0s/sDxRjqzw8R2yZpN8MedTgUh2gp KLnnxaiJIbJ7d1HjTrZymaqCTezgorNSY5+yu2L/6AWxHkZj/7LYZWa9YAuexht+4vKn 2rxw== X-Gm-Message-State: AGi0PuYz2RqsqpdOjyLp0FV1QVhEJ5EPsEoDAfM2BK9YJaGF+OZmVWxF EsEfTqqWbRgB7dg46TonKZK82ikS X-Google-Smtp-Source: APiQypKkiyy8d0BP1g6L2jbuXbn/k5R2cZIiGstHUVINddIom6GhXAwXREs0Cq2MBDKVQBymwEvYlA== X-Received: by 2002:a2e:b5d2:: with SMTP id g18mr13680570ljn.51.1587975542513; Mon, 27 Apr 2020 01:19:02 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:01 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 01/21] drm/panel: add connector type to boe, hv070wsa-100 panel Date: Mon, 27 Apr 2020 10:18:30 +0200 Message-Id: <20200427081850.17512-2-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Laurent Pinchart , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The boe,hv070wsa-100 panel is a LVDS panel. Fix connector type to reflect this. With this change users of this panel do not have to specify the connector type. v2: - Add .bus_format (Laurent) - Add .bus_flags Signed-off-by: Sam Ravnborg Cc: Laurent Pinchart Cc: Thierry Reding Cc: Sam Ravnborg --- drivers/gpu/drm/panel/panel-simple.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 5e56c68fbd3e..80388706057e 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -1128,6 +1128,9 @@ static const struct panel_desc boe_hv070wsa = { .width = 154, .height = 90, }, + .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG, + .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_NEGEDGE, + .connector_type = DRM_MODE_CONNECTOR_LVDS, }; static const struct drm_display_mode boe_nv101wxmn51_modes[] = { From patchwork Mon Apr 27 08:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511449 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ADC7C912 for ; Mon, 27 Apr 2020 08:19: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 8BAAF20661 for ; Mon, 27 Apr 2020 08:19:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iAYcV+sy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BAAF20661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EDEF89FD9; Mon, 27 Apr 2020 08:19:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAD6389FCE for ; Mon, 27 Apr 2020 08:19:05 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id 198so13088292lfo.7 for ; Mon, 27 Apr 2020 01:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qe1H0UppIJU0bk0anv3RDB/Ffm44oo9jDJ5R/kYBXCQ=; b=iAYcV+sycQntXHcpFceMuQszFybFkiOoTztLIb97CxsVGmXC0sLBRw7Nd2QUpnnWN5 /JH68cJbzHdGc2+fdkcAENZA8KJYf7dN6DVxINuKBlks89knace6jODyImZj3JiVUNK6 VKHUuwkq8Tjy3Ayqy0HNZ300osfgTEUpzJ2wZ9l4XZGZIy6X5ecjPBbF/pgnBsigKuxE FknMCQE39RzEAkq5y2BYqpPShThkCRdeczid0c1PaKepOPbozA4uxLx5VQKE8QB8dBaG OiAt3m1gyC98jokbMxTT0zhLV36Hnl3SWhSDS5dthHAc7Yr9VAsYzlfCr/ypyR72/iq3 qKiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qe1H0UppIJU0bk0anv3RDB/Ffm44oo9jDJ5R/kYBXCQ=; b=Pqhyc+erAdEeLC52rv7rt6oO0fUF3d/y/a1Nku5xYGuwiLonii/pt0CQcQiUyoZGaH DQffcPY+Cecn8Ik0SfbcS7c5/nnGNgcwZ3BLUq9GB5cCn4YEB/t2gaJXnP9I0YYJw3v0 214ebCaIDKQx7fQPZDfDc/bYaDHmShkP8d/q7lXaWSU8GoIgABJd5uECjnc6ZXLt0SSL Uq1p9L0YFOaM6rgds+cUnALQoFhSCX1QqYa3mH2uf11DpkaFtCoZf8c4F1ZroY43HxO7 5DAYI6yZEOx3lghAWrYR++/yTsf3PCuoERTkYa9ybiqQL+tVVVgm3BT6aCwzBfCaNK8h yL1A== X-Gm-Message-State: AGi0PuZMP87geGLcdc6W3N6hhkXH1+maS2JicFRAj/JoZL1Qjr5nLZG6 togYV3tb2BwX0MSqLGWoAynzMDjP X-Google-Smtp-Source: APiQypJ9ID3fmAOjZAF398JjvVtKvQr/vOkai5xR+nwwxy3h6EcnYAR0cMZsC8K0fRZDK7766FHvdQ== X-Received: by 2002:ac2:4105:: with SMTP id b5mr14858919lfi.94.1587975543689; Mon, 27 Apr 2020 01:19:03 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:03 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 02/21] drm/panel: panel-simple: add default connector_type Date: Mon, 27 Apr 2020 10:18:31 +0200 Message-Id: <20200427081850.17512-3-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" All panels shall report a connector type. panel-simple has a lot of panels with no connector_type, and for these fall back to DPI as the default. Signed-off-by: Sam Ravnborg Cc: Thierry Reding Cc: Sam Ravnborg --- drivers/gpu/drm/panel/panel-simple.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 80388706057e..13c25ee38dbf 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -451,6 +451,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) struct panel_simple *panel; struct display_timing dt; struct device_node *ddc; + int connector_type; int err; panel = devm_kzalloc(dev, sizeof(*panel), GFP_KERNEL); @@ -495,8 +496,13 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) panel_simple_parse_panel_timing_node(dev, panel, &dt); } - drm_panel_init(&panel->base, dev, &panel_simple_funcs, - desc->connector_type); + /* Default DRM_MODE_CONNECTOR_DPI if no connector_type is set */ + if (desc->connector_type != 0) + connector_type = desc->connector_type; + else + connector_type = DRM_MODE_CONNECTOR_DPI; + + drm_panel_init(&panel->base, dev, &panel_simple_funcs, connector_type); err = drm_panel_of_backlight(&panel->base); if (err) From patchwork Mon Apr 27 08:18:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1265315E6 for ; Mon, 27 Apr 2020 08:19:58 +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 E517F2087E for ; Mon, 27 Apr 2020 08:19:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TOaqkhEC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E517F2087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEBBD6E0F2; Mon, 27 Apr 2020 08:19:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id 909D889FA9 for ; Mon, 27 Apr 2020 08:19:06 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id u10so13050068lfo.8 for ; Mon, 27 Apr 2020 01:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xeuu1jYzNEltJPw799kxI/zy0nH1kCXYGlHuMvk52IA=; b=TOaqkhECjqNP0HYTmVh5qPkinsK7Kh7goK5K4a31lajwVLZaOuY7cYRG4eUfAJdGw8 G+Y3yjHYmWTVZ37Ml9DqCGFo0NAF79EHxFCNsvDZOCeaO33W2PMbMcZjenOZQKs3Qy53 IW2Op/k2B+SxzX7doZljRUhGdxZdb64RdQs1BNV07WBU2haSjM+VVDIR+hr+V9s0zxPw tO83d0tVJ6hK53zwQYntbCJuSoEMnqWEfQteJVN//2yiiqPt0fUrRyvRu7iZlbp+/KGh jFctrBopCNv6GIIBEI21JUNGBPEcKJkikIKoiOuCQfuBz8recR0U+3oHcCcz/K7+OQ6K eCoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xeuu1jYzNEltJPw799kxI/zy0nH1kCXYGlHuMvk52IA=; b=gm6WH85Me/W0B/GuYqN6qUfZdFYcV235eA0zpVpRnbDnpWO52M4OcF7OQfJEjwNz+F ZVbsrTDu07aidkM+flAscZPg7l3gjCdYz9z7jjSQkit5m6hZnbhhio7aV8qLdWf94m5f Wop6EzMwFxgU+nxjO9eoS41pC/8era3wQlBGAG13OvKIYNr9+Mah6MoFw8ljJe+hDhxM KQoPGaK8ZZiFQLRHd2/uAyKukTse3ChNfiF8W5LhQ1cdvOG5BEJ6boUoWEFD9CFSDcxc aWDXfmcTkxVhdHH/7ammF+YvclJbabVvTC1B/pf1YQKDO9pH2QCL4GfS7jXLGKATQ9fG NDtg== X-Gm-Message-State: AGi0PubTnjKxXIf6grB7sNcvdMJMW/5uliHsYAsNh1ak1hLjot0JGMEi tKujPC4vDHwZBi34NlK7cHNsYKtr X-Google-Smtp-Source: APiQypLQS3B064UcugCUIB7QbBxE46ZJ9dqKU3JzxIejrjrupGcnMNlRSbDO/k/u7dR6QBI6xlpgbQ== X-Received: by 2002:a19:d84:: with SMTP id 126mr14818637lfn.35.1587975544722; Mon, 27 Apr 2020 01:19:04 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:04 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 03/21] drm/bridge: tc358764: drop drm_connector_(un)register Date: Mon, 27 Apr 2020 10:18:32 +0200 Message-Id: <20200427081850.17512-4-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Laurent Pinchart , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Drop drm_connector handling that is not needed: - drm_dev_register() in the display controller driver takes care of registering connectors. So the call to drm_connector_register() call is not needed in the bridge driver. - Use of drm_connector_unregister() is only required for drivers that explicit have called drm_dev_register. - The reference counting using drm_connector_put() is likewise not needed. Signed-off-by: Sam Ravnborg Reviewed-by: Laurent Pinchart Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358764.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c index 5ac1430fab04..a277739fab58 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -375,7 +375,6 @@ static int tc358764_attach(struct drm_bridge *bridge, drm_connector_attach_encoder(&ctx->connector, bridge->encoder); drm_panel_attach(ctx->panel, &ctx->connector); ctx->connector.funcs->reset(&ctx->connector); - drm_connector_register(&ctx->connector); return 0; } @@ -384,10 +383,8 @@ static void tc358764_detach(struct drm_bridge *bridge) { struct tc358764 *ctx = bridge_to_tc358764(bridge); - drm_connector_unregister(&ctx->connector); drm_panel_detach(ctx->panel); ctx->panel = NULL; - drm_connector_put(&ctx->connector); } static const struct drm_bridge_funcs tc358764_bridge_funcs = { From patchwork Mon Apr 27 08:18:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F368C912 for ; Mon, 27 Apr 2020 08:19:44 +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 D22DD2087E for ; Mon, 27 Apr 2020 08:19:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hPBCLZuE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D22DD2087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D8806E0CF; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7ED589FA9 for ; Mon, 27 Apr 2020 08:19:07 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id 131so13019114lfh.11 for ; Mon, 27 Apr 2020 01:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=44LbaTEcIFEJWRuTX5noLRkpnxVAvPcaJ/DYcm4Ot8U=; b=hPBCLZuE0hXCFuV18eWbzGtk2v+8LTKp6T8KTWBoGQMX1HEUBFu4OOptLDMQbcXqnC 9Eb1ekKGQ4+ZlU7/L+Il7AX4eFL4EsVJjIpPqu1YHT9P3NJdmgTRa+xVwxA7BLScd0Sb KrcOmDek8m3W/sEMuVgMVQgttgf53hk8uO30kp0TBvwgJEcmLsFLK6sJF6Do9PFNeSDz jEWK79rsmi5/hsF3jFSvT5T297pUO1OiymmPqOlJxEG5S2QtqYXbX5CxwbMUIaAIUFBm 1q9rkE2TCIoN+fDGqX2me3W+2mUkUZ95dlxuAHdXEuJ88qv/xVTc37IRK4xRnmOBEAP+ aNnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=44LbaTEcIFEJWRuTX5noLRkpnxVAvPcaJ/DYcm4Ot8U=; b=LNCzlYRKbUjwb4/7nbskfBgSrig0oLsVz4Xqb7EzgwCVTox6/oA++sDVotb8MO4JsV Y3J51dtwGuHbFmXTQe1iL9q8g+Au6t+rhbfMPLkeU/UTYnW3RR93ebF9TfiPLu1oyRqX +sJSfOGnZM3Rf++eJwmDTzw7mqDi2KkdfTB6U7hH/58rlN+cUG7tqyo3vGWi52mfRbdK w7r89mZ1FEZFXB7COgBsdc1pIXHKOXMaHIuK0jkCFwd8Y44mX8zz1wHdhSc0icWBWlQO eWLGA6ncAwDlqXRIpre//CarSAOPv9VHV5GkWV8gQ16ax4SIcQ8nf0LK9REiC0H2KKnf mZbQ== X-Gm-Message-State: AGi0PuajC67KAmYQ5CQnxaa6y6WRp9PbixaH8Cp1A0A+qUdshTpmIzve wZR2+7V6/IKLh0RWaFkU0gIO9H8C X-Google-Smtp-Source: APiQypLwMWnC/Ic/SkI0FZqgZX9h88k53s/ZUxuwe9yVe2jWx5J74Zip6836KeNPyN+TyWDmvGH3cQ== X-Received: by 2002:ac2:5e26:: with SMTP id o6mr14292672lfg.49.1587975545947; Mon, 27 Apr 2020 01:19:05 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:05 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 04/21] drm/bridge: tc358764: add drm_panel_bridge support Date: Mon, 27 Apr 2020 10:18:33 +0200 Message-Id: <20200427081850.17512-5-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Laurent Pinchart , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for use in a chained setup by replacing direct use of drm_panel with drm_panel_bridge support. The bridge panel will use the connector type reported by the panel, where the connector for this driver hardcode DRM_MODE_CONNECTOR_LVDS. Signed-off-by: Sam Ravnborg Reviewed-by: Laurent Pinchart Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec Reported-by: kbuild test robot --- drivers/gpu/drm/bridge/tc358764.c | 59 +++++++++---------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c index a277739fab58..3adb2c191499 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -156,7 +156,7 @@ struct tc358764 { struct drm_connector connector; struct regulator_bulk_data supplies[ARRAY_SIZE(tc358764_supplies)]; struct gpio_desc *gpio_reset; - struct drm_panel *panel; + struct drm_bridge *panel_bridge; int error; }; @@ -282,7 +282,7 @@ static int tc358764_get_modes(struct drm_connector *connector) { struct tc358764 *ctx = connector_to_tc358764(connector); - return drm_panel_get_modes(ctx->panel, connector); + return drm_bridge_get_modes(ctx->panel_bridge, connector); } static const @@ -298,23 +298,11 @@ static const struct drm_connector_funcs tc358764_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static void tc358764_disable(struct drm_bridge *bridge) -{ - struct tc358764 *ctx = bridge_to_tc358764(bridge); - int ret = drm_panel_disable(bridge_to_tc358764(bridge)->panel); - - if (ret < 0) - dev_err(ctx->dev, "error disabling panel (%d)\n", ret); -} - static void tc358764_post_disable(struct drm_bridge *bridge) { struct tc358764 *ctx = bridge_to_tc358764(bridge); int ret; - ret = drm_panel_unprepare(ctx->panel); - if (ret < 0) - dev_err(ctx->dev, "error unpreparing panel (%d)\n", ret); tc358764_reset(ctx); usleep_range(10000, 15000); ret = regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies); @@ -335,18 +323,6 @@ static void tc358764_pre_enable(struct drm_bridge *bridge) ret = tc358764_init(ctx); if (ret < 0) dev_err(ctx->dev, "error initializing bridge (%d)\n", ret); - ret = drm_panel_prepare(ctx->panel); - if (ret < 0) - dev_err(ctx->dev, "error preparing panel (%d)\n", ret); -} - -static void tc358764_enable(struct drm_bridge *bridge) -{ - struct tc358764 *ctx = bridge_to_tc358764(bridge); - int ret = drm_panel_enable(ctx->panel); - - if (ret < 0) - dev_err(ctx->dev, "error enabling panel (%d)\n", ret); } static int tc358764_attach(struct drm_bridge *bridge, @@ -356,6 +332,11 @@ static int tc358764_attach(struct drm_bridge *bridge, struct drm_device *drm = bridge->dev; int ret; + ret = drm_bridge_attach(bridge->encoder, ctx->panel_bridge, + bridge, flags); + if (ret < 0) + return ret; + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { DRM_ERROR("Fix bridge driver to make connector optional!"); return -EINVAL; @@ -373,32 +354,21 @@ static int tc358764_attach(struct drm_bridge *bridge, drm_connector_helper_add(&ctx->connector, &tc358764_connector_helper_funcs); drm_connector_attach_encoder(&ctx->connector, bridge->encoder); - drm_panel_attach(ctx->panel, &ctx->connector); ctx->connector.funcs->reset(&ctx->connector); return 0; } -static void tc358764_detach(struct drm_bridge *bridge) -{ - struct tc358764 *ctx = bridge_to_tc358764(bridge); - - drm_panel_detach(ctx->panel); - ctx->panel = NULL; -} - static const struct drm_bridge_funcs tc358764_bridge_funcs = { - .disable = tc358764_disable, .post_disable = tc358764_post_disable, - .enable = tc358764_enable, .pre_enable = tc358764_pre_enable, .attach = tc358764_attach, - .detach = tc358764_detach, }; static int tc358764_parse_dt(struct tc358764 *ctx) { struct device *dev = ctx->dev; + struct drm_panel *panel; int ret; ctx->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); @@ -407,12 +377,15 @@ static int tc358764_parse_dt(struct tc358764 *ctx) return PTR_ERR(ctx->gpio_reset); } - ret = drm_of_find_panel_or_bridge(ctx->dev->of_node, 1, 0, &ctx->panel, - NULL); - if (ret && ret != -EPROBE_DEFER) - dev_err(dev, "cannot find panel (%d)\n", ret); + ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); + if (ret) + return ret; - return ret; + ctx->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(ctx->panel_bridge)) + return PTR_ERR(ctx->panel_bridge); + + return 0; } static int tc358764_configure_regulators(struct tc358764 *ctx) From patchwork Mon Apr 27 08:18:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511471 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDC28912 for ; Mon, 27 Apr 2020 08:19:40 +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 9C2412087E for ; Mon, 27 Apr 2020 08:19:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uQYGN/yZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C2412087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E420B6E0E4; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51B1B89FA9 for ; Mon, 27 Apr 2020 08:19:09 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id 198so13088433lfo.7 for ; Mon, 27 Apr 2020 01:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j1wBVGWZBLJGGWmZJQCkiiFA5pJ4Zh7uYCZioqKNsMQ=; b=uQYGN/yZ+slEiAp8AXhG6nk6Wy37f6UQ3NfK3AFXAS3QBAL1ZoIlBjS8qybs75MmS4 2csxIuzMp97bwTFQqyBovljNX2Ii8IwCwtMKFoXhcDwqUrAPwic7w8e72nUtnGiyIi0e vi3v1zjVB6FFhNM1CUrfuXd3Bvl8CKd9j6PsDiK9xCneKhbgaj8R/eCVFg9DQR2yB6l8 XKIHyIc5O4N6ptjj8wPQEm5zBrCJYx1Xz8zXez3TIqRs7JQgmCt6bc92acg7hYS6OG65 57zTd1XaAbcjJXV1kGyt3FAXsyBMR6a8s6e3UlXf+WnGIYhHHj/nXB0d9nCOUDmooW49 YBrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=j1wBVGWZBLJGGWmZJQCkiiFA5pJ4Zh7uYCZioqKNsMQ=; b=NkiNqkw6dQ0xSlVlxrYt7i0wdzpfrXT6mCuNMVPzSQ70dCdBPEzXnADHQq1gmAYEt9 SEB0IIQdwAVgLEfWGjeTOCU32aR7/hJZXwkqbxFWiPmswELIXRJB187fb4W2BNDxh/TR mv+08IZlrBxDq4SVXdfTlTTXMjE5OZXpI9j6f6d9LrLI0no8GTRnP3j0n7EF2NmI2+AL +0xA1pJH6uo63ygbNpolDCTZzqWcu0022xxy62AeZVqi1GDglUXGYt/Xp2D2NkpNdO34 LyvFh+n3FneFcGbOC/Y5OAQ0AioV2nhRc/qiI2oysWRXfNhwmU+bSeT56ZO+46mhbqm3 WySQ== X-Gm-Message-State: AGi0PubiiF+ihBQtQ/RRdzb4yYTYhFOe3ZwjM4Mot/gmG5IuJ4ZY5Uv+ 2TU+i0N/9g2wqJiBsCEGVUdTzldS X-Google-Smtp-Source: APiQypJFSsoeMZ4dE5xMtoyir41iPjdtqvWNur4Tex5WqQ1ys1T3i5JdBanYln1R0vA7JYn6D4rNGQ== X-Received: by 2002:a05:6512:31c1:: with SMTP id j1mr14994254lfe.14.1587975547448; Mon, 27 Apr 2020 01:19:07 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:06 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 05/21] drm/bridge: tc358764: make connector creation optional Date: Mon, 27 Apr 2020 10:18:34 +0200 Message-Id: <20200427081850.17512-6-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Laurent Pinchart , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Make the connector creation optional to enable usage of the tc358764 bridge with the DRM bridge connector helper. Signed-off-by: Sam Ravnborg Reviewed-by: Laurent Pinchart Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358764.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c index 3adb2c191499..4013add64119 100644 --- a/drivers/gpu/drm/bridge/tc358764.c +++ b/drivers/gpu/drm/bridge/tc358764.c @@ -337,10 +337,8 @@ static int tc358764_attach(struct drm_bridge *bridge, if (ret < 0) return ret; - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); - return -EINVAL; - } + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) + return 0; ctx->connector.polled = DRM_CONNECTOR_POLL_HPD; ret = drm_connector_init(drm, &ctx->connector, From patchwork Mon Apr 27 08:18:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511467 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F72E912 for ; Mon, 27 Apr 2020 08:19:38 +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 E1577206D4 for ; Mon, 27 Apr 2020 08:19:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="njKsRRpM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1577206D4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 523CF6E0DB; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97F036E0A1 for ; Mon, 27 Apr 2020 08:19:10 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id a21so13706645ljj.11 for ; Mon, 27 Apr 2020 01:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LYml//Ln+DHYXuRXufRtaTo0Xg64HmumE/pYXyPXe6I=; b=njKsRRpMt350l0kqOWuI0O34tRgCWNbaPVkIBgK+mGH77Zs5C+ZNA20MqPbrej3Qdx p3g2eTh01ktLd3sTPGeOlYQKYaur0YTY4PXDdg0dFu3wXWuTXkbJQw3nQaF+DqXxmQm7 dP7dDt43rx8s1DxIkeDTmEItOwI58wnOsmtydzq3Ovu2OqvDtbqT9eMEN6DaEGFfah75 C3TP4VHV6EaRYY2as7gCDdphXU6Q7Gy/c4po4fRrQ/sECBaVSGp6cARTbkHzI651Qlbk HeqiIDV8fnFO0d0bTQUsRO0I9D42J6s3x5BW8u6eEW8aC+nsLN6M0xIL0PnKuY5FW09c kBeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LYml//Ln+DHYXuRXufRtaTo0Xg64HmumE/pYXyPXe6I=; b=Hn0fMQz59wT/sxj0hZ5ZjRIIVFRmem7Al6wvMBgHEv/nmDNRUwNpUjIzdz7i2vwv9j M+WfS8sacubYFAUwuVnb/mG6ipNGCqRKF7YkPhjLYZdenKyPKnNDSG3MUzVklTbmTR83 juDlRvASfNAeOXHw2MyCqGlIrICjulJbdhhotgtREHlLDkTzHsS1vP5TJSLxNFDQG7Ci hlmk78fzJLpQDQ+zlDVZdP8eaELdHT7rwqNHQIP0IqV2JtS3+Va4/mnbju0XHcasf1dw wv90cdpddXS45fHRU8X0HrPZxXxOasv5njRa3kvbrJ+IaL3SfdNgbfkRcOgPWaJHvwNp 30Pw== X-Gm-Message-State: AGi0PubAa1VthXcG8WKccoSclD5r2HcwU57kb0Tm2KnlhbXUHElrMlvj 9d+5s1REtx3Ena4aVAF/47pHbCtX X-Google-Smtp-Source: APiQypL/5qIEg94hPVA49zicml/+cG3sEVrj1afilwd9jxS0LLoSi8O0wdLOoaOGH/iZRD0FbXtxYQ== X-Received: by 2002:a2e:9c92:: with SMTP id x18mr12907485lji.218.1587975548640; Mon, 27 Apr 2020 01:19:08 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:08 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 06/21] drm/bridge: tc358767: add drm_panel_bridge support Date: Mon, 27 Apr 2020 10:18:35 +0200 Message-Id: <20200427081850.17512-7-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for use in a chained setup by replacing direct use of drm_panel with drm_panel_bridge support. The bridge driver assume the panel is optional. The relevant tests are migrated over to check for the pnale bridge to keep the same functionality. Note: the bridge panel will use the connector type from the panel. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358767.c | 57 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index e4c0ea03ae3a..51f80ded6235 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -244,8 +244,8 @@ struct tc_data { struct drm_dp_aux aux; struct drm_bridge bridge; + struct drm_bridge *panel_bridge; struct drm_connector connector; - struct drm_panel *panel; /* link settings */ struct tc_edp_link link; @@ -1236,13 +1236,6 @@ static int tc_stream_disable(struct tc_data *tc) return 0; } -static void tc_bridge_pre_enable(struct drm_bridge *bridge) -{ - struct tc_data *tc = bridge_to_tc(bridge); - - drm_panel_prepare(tc->panel); -} - static void tc_bridge_enable(struct drm_bridge *bridge) { struct tc_data *tc = bridge_to_tc(bridge); @@ -1266,8 +1259,6 @@ static void tc_bridge_enable(struct drm_bridge *bridge) tc_main_link_disable(tc); return; } - - drm_panel_enable(tc->panel); } static void tc_bridge_disable(struct drm_bridge *bridge) @@ -1275,8 +1266,6 @@ static void tc_bridge_disable(struct drm_bridge *bridge) struct tc_data *tc = bridge_to_tc(bridge); int ret; - drm_panel_disable(tc->panel); - ret = tc_stream_disable(tc); if (ret < 0) dev_err(tc->dev, "main link stream stop error: %d\n", ret); @@ -1286,13 +1275,6 @@ static void tc_bridge_disable(struct drm_bridge *bridge) dev_err(tc->dev, "main link disable error: %d\n", ret); } -static void tc_bridge_post_disable(struct drm_bridge *bridge) -{ - struct tc_data *tc = bridge_to_tc(bridge); - - drm_panel_unprepare(tc->panel); -} - static bool tc_bridge_mode_fixup(struct drm_bridge *bridge, const struct drm_display_mode *mode, struct drm_display_mode *adj) @@ -1347,9 +1329,11 @@ static int tc_connector_get_modes(struct drm_connector *connector) return 0; } - count = drm_panel_get_modes(tc->panel, connector); - if (count > 0) - return count; + if (tc->panel_bridge) { + count = drm_bridge_get_modes(tc->panel_bridge, connector); + if (count > 0) + return count; + } edid = drm_get_edid(connector, &tc->aux.ddc); @@ -1377,7 +1361,7 @@ static enum drm_connector_status tc_connector_detect(struct drm_connector *conne int ret; if (tc->hpd_pin < 0) { - if (tc->panel) + if (tc->panel_bridge) return connector_status_connected; else return connector_status_unknown; @@ -1412,6 +1396,13 @@ static int tc_bridge_attach(struct drm_bridge *bridge, struct drm_device *drm = bridge->dev; int ret; + if (tc->panel_bridge) { + ret = drm_bridge_attach(tc->bridge.encoder, tc->panel_bridge, + &tc->bridge, flags); + if (ret < 0) + return ret; + } + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { DRM_ERROR("Fix bridge driver to make connector optional!"); return -EINVAL; @@ -1420,7 +1411,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge, /* Create DP/eDP connector */ drm_connector_helper_add(&tc->connector, &tc_connector_helper_funcs); ret = drm_connector_init(drm, &tc->connector, &tc_connector_funcs, - tc->panel ? DRM_MODE_CONNECTOR_eDP : + tc->panel_bridge ? DRM_MODE_CONNECTOR_eDP : DRM_MODE_CONNECTOR_DisplayPort); if (ret) return ret; @@ -1434,9 +1425,6 @@ static int tc_bridge_attach(struct drm_bridge *bridge, DRM_CONNECTOR_POLL_DISCONNECT; } - if (tc->panel) - drm_panel_attach(tc->panel, &tc->connector); - drm_display_info_set_bus_formats(&tc->connector.display_info, &bus_format, 1); tc->connector.display_info.bus_flags = @@ -1452,10 +1440,8 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { .attach = tc_bridge_attach, .mode_valid = tc_mode_valid, .mode_set = tc_bridge_mode_set, - .pre_enable = tc_bridge_pre_enable, .enable = tc_bridge_enable, .disable = tc_bridge_disable, - .post_disable = tc_bridge_post_disable, .mode_fixup = tc_bridge_mode_fixup, }; @@ -1546,6 +1532,7 @@ static irqreturn_t tc_irq_handler(int irq, void *arg) static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct device *dev = &client->dev; + struct drm_panel *panel; struct tc_data *tc; int ret; @@ -1556,10 +1543,20 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) tc->dev = dev; /* port@2 is the output port */ - ret = drm_of_find_panel_or_bridge(dev->of_node, 2, 0, &tc->panel, NULL); + ret = drm_of_find_panel_or_bridge(dev->of_node, 2, 0, &panel, NULL); if (ret && ret != -ENODEV) return ret; + if (panel) { + struct drm_bridge *pbridge; + + pbridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(pbridge)) + return PTR_ERR(pbridge); + + tc->panel_bridge = pbridge; + } + /* Shut down GPIO is optional */ tc->sd_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH); if (IS_ERR(tc->sd_gpio)) From patchwork Mon Apr 27 08:18:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511489 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4BA9912 for ; Mon, 27 Apr 2020 08:19:56 +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 935722087E for ; Mon, 27 Apr 2020 08:19:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qr5yPM5T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 935722087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E39626E101; Mon, 27 Apr 2020 08:19:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 151656E0CB for ; Mon, 27 Apr 2020 08:19:12 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id l19so16583553lje.10 for ; Mon, 27 Apr 2020 01:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VP2/278WkYO+H5RLQTt421elIwxLMbKbJ63B0FTUyV0=; b=Qr5yPM5Tp1VD4vDkaFAInWcO8l4Ohaw+Y0chgrNMgtDFtsAv4TGzWnqWPV97HJnh37 QNVvz7aC9KKK7MAbWUschLnfAQ/tLk0Ychq5Hg8DoIvMxWmUJ8CtdvZz79DvGir2DAnp FL2mqSYkm6d1quIBo/T+eB67mBxC04oMKsGDFIJXSttEZLst0hRxEdjM8YD12p8HpqC9 DwutinImymDbwZwHete+/kGPzmAFlGtWWRRRWABmumf27D3IT/jWzHRtlFG3Si8pKuhs 5lfUdDRJmlqiD3Ril20yUHQQqNdKXJfaUJ1QmEvTrvoKMKq104L/FHUpyrU9yLnwfujT VEQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=VP2/278WkYO+H5RLQTt421elIwxLMbKbJ63B0FTUyV0=; b=SmE+qxOXUlShMdtOGaICh8WMaRLVywMUHtfytjrFWsQjpYpnaoNe4j6jwxAXtiyQis lT5u0FvTmTRzkmFTiDv9mVDAqs+4yVNiw/Cn/QGZr3kFovRFhWuZBxbJdo0E2C+VuMyt 2o5bgpX7EMySdkDuibsw7bY7HjLcJ1u37TsHKiiKNd0DBYmwpG95S00teaYGYEFejhD/ 2nwtqoTs4B6XgRK9PQja5jghzvVa+5sCfCu0WQf6ly98k8/XnDZi2RccG0eD23Y9Yq/V b56qPMq4ICWWmEY1IiB+s+gD1zYCpKsMLv1IJ8Lwq2US+jp6dQ+o2c3ezqTK6Y6J5pmI 3y+Q== X-Gm-Message-State: AGi0PuaXH6XjyLWgLonV21Ey6EFv8p0uW6PgqBkYzfEzDy8E+JGwknpb xK8q76mapHycsP2rupAMEY4P9tEq X-Google-Smtp-Source: APiQypIrVXubIzogZX7uRvleXMHNrG2btXi9VN+Soec0bVTc659z7nVQtduFUpYH+YH+u9KitgF8aA== X-Received: by 2002:a2e:6c16:: with SMTP id h22mr12560899ljc.30.1587975549643; Mon, 27 Apr 2020 01:19:09 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:09 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 07/21] drm/bridge: tc358767: add detect bridge operation Date: Mon, 27 Apr 2020 10:18:36 +0200 Message-Id: <20200427081850.17512-8-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for chained operation by adding support for the detect operation. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358767.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 51f80ded6235..211a058c7243 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1352,10 +1352,9 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = { .get_modes = tc_connector_get_modes, }; -static enum drm_connector_status tc_connector_detect(struct drm_connector *connector, - bool force) +static enum drm_connector_status tc_bridge_detect(struct drm_bridge *bridge) { - struct tc_data *tc = connector_to_tc(connector); + struct tc_data *tc = bridge_to_tc(bridge); bool conn; u32 val; int ret; @@ -1379,6 +1378,14 @@ static enum drm_connector_status tc_connector_detect(struct drm_connector *conne return connector_status_disconnected; } +static enum drm_connector_status +tc_connector_detect(struct drm_connector *connector, bool force) +{ + struct tc_data *tc = connector_to_tc(connector); + + return tc_bridge_detect(&tc->bridge); +} + static const struct drm_connector_funcs tc_connector_funcs = { .detect = tc_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, @@ -1443,6 +1450,7 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { .enable = tc_bridge_enable, .disable = tc_bridge_disable, .mode_fixup = tc_bridge_mode_fixup, + .detect = tc_bridge_detect, }; static bool tc_readable_reg(struct device *dev, unsigned int reg) @@ -1676,6 +1684,8 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) return ret; tc->bridge.funcs = &tc_bridge_funcs; + tc->bridge.ops = DRM_BRIDGE_OP_DETECT; + tc->bridge.of_node = dev->of_node; drm_bridge_add(&tc->bridge); From patchwork Mon Apr 27 08:18:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511503 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E2CA515E6 for ; Mon, 27 Apr 2020 08:20:14 +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 C0EA020661 for ; Mon, 27 Apr 2020 08:20:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YmjmkIiw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0EA020661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54D9D6E0EC; Mon, 27 Apr 2020 08:20:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB9716E0D4 for ; Mon, 27 Apr 2020 08:19:12 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id l19so16583591lje.10 for ; Mon, 27 Apr 2020 01:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dVCpJuXIjdYiyeM0xRpClT6FSdk8oCsw6TMHYEMUaYs=; b=YmjmkIiwq24gmCplfe4sZlenmfs9YxwNsdtX/zjwR960jTEE9xZ2pUH/JEMhUozUci +EZWTL1Bfqk+2aPJP/mIecQwTvmniLIcEXRdGjOMazi64uYtGAlMQgIMgXH4jAHLxH3R t6FIUpqXVBJOYZ+oPvlVKrorv7aakT55U3ZfAnuOmKNOC3caCAyLq9yUpyEPnbp0TqDJ crJ9FvE2NvsNNuBY+GoOgH+ZiwQfZ4CRaSQDRMcuweRNSF2im2O+6s+GZeGTgJpffDRz cGFFKYsioJVMtkF3/W0WBsYTPO7Kx8Nj77t63atz87Zbkm2MGnmkmm+o5dk156SQjGFT 8SGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dVCpJuXIjdYiyeM0xRpClT6FSdk8oCsw6TMHYEMUaYs=; b=f+NCgFR7kq9NLO3El2iyLqej8dDwYB1K+zeJarcHCzwb3+rMTrh/VNPsrcjNcwkaD0 TN34YEJybhwMLUgzN3Tnw/wWSpyE4AySbmzuRE5cIsrkWLfHbhECmNCZSobi5Qka1k9R as4ohX3IsztzN4ftz6pE2mO2V6Ws29UdnsFb+aO6GDW4wamcdpQH+vM8L20Ad8vhhRNM y2/1REQHaDjGl2/y4OfCWra7xVDK0bA2C0LeKNqITCfFAIOi6+TtR+irQ7opZhb20J8i 0wdf7VYNeNya3LkFXYZ7e6jyQC+yNFgs+eQ3P+BOIsWdm3neVOpeJDAHA7wYKQZeF9HY 7mfw== X-Gm-Message-State: AGi0Puae1/m0j+krCSE3LcL3ND14BF7WRvkbQZo9y+xROnZMhvDQpP01 SjblgPk8LulKSk/foJEbsoj158Ua X-Google-Smtp-Source: APiQypL/lisDqlH89Y56DgNeAdu9/PxMGe0W+lLdACDOrMZ+0Pkw0gXPzy9oFhubAddP64bxkJ5kcw== X-Received: by 2002:a2e:3519:: with SMTP id z25mr11516123ljz.253.1587975550852; Mon, 27 Apr 2020 01:19:10 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:10 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 08/21] drm/bridge: tc358767: add get_edid bride operation Date: Mon, 27 Apr 2020 10:18:37 +0200 Message-Id: <20200427081850.17512-9-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare for chained bridge with the addition of get_edid support. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358767.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 211a058c7243..42a153bcde64 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1316,6 +1316,20 @@ static void tc_bridge_mode_set(struct drm_bridge *bridge, tc->mode = *mode; } +static struct edid *tc_get_edid(struct drm_bridge *bridge, + struct drm_connector *connector) +{ + struct tc_data *tc = bridge_to_tc(bridge); + struct edid *edid; + + edid = drm_get_edid(connector, &tc->aux.ddc); + + kfree(tc->edid); + tc->edid = edid; + + return edid; +} + static int tc_connector_get_modes(struct drm_connector *connector) { struct tc_data *tc = connector_to_tc(connector); @@ -1335,12 +1349,7 @@ static int tc_connector_get_modes(struct drm_connector *connector) return count; } - edid = drm_get_edid(connector, &tc->aux.ddc); - - kfree(tc->edid); - tc->edid = edid; - if (!edid) - return 0; + edid = tc_get_edid(&tc->bridge, connector); drm_connector_update_edid_property(connector, edid); count = drm_add_edid_modes(connector, edid); @@ -1451,6 +1460,7 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { .disable = tc_bridge_disable, .mode_fixup = tc_bridge_mode_fixup, .detect = tc_bridge_detect, + .get_edid = tc_get_edid, }; static bool tc_readable_reg(struct device *dev, unsigned int reg) @@ -1684,7 +1694,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) return ret; tc->bridge.funcs = &tc_bridge_funcs; - tc->bridge.ops = DRM_BRIDGE_OP_DETECT; + tc->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID; tc->bridge.of_node = dev->of_node; drm_bridge_add(&tc->bridge); From patchwork Mon Apr 27 08:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511509 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91DF615E6 for ; Mon, 27 Apr 2020 08:20:20 +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 7084120661 for ; Mon, 27 Apr 2020 08:20:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t+8b7WNB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7084120661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C1B166E11D; Mon, 27 Apr 2020 08:20:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDF9C6E0CB for ; Mon, 27 Apr 2020 08:19:13 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id f11so12000049ljp.1 for ; Mon, 27 Apr 2020 01:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ALkfhn3QaNrniNePVGIjgtDOKGkOGwVOHVa32KEOksM=; b=t+8b7WNBct1FDvleiNrbZ4p1S7WPMzxxlY/yghR0Pt8rNy2nZKYF6r03bQFRWTuRnI SmsHI//TtmmtdjQwqIDsOTKhswsHh5M7B43zLGDSJfengmwdsbHYJf8SQC6HZoeHKv/+ 0pjXLTvTpldpIPnu53u8v79Aixtvb64sTMEF9F+dDg3lc++nZwVx/k93EWY2ivxXoJAZ 3Tu5hwJwp9vDU2qJbR7fjHn2caci3kZIKtxTygBFJ6cjldubO9OUdf5lzdb8jhkpnW5/ LSlBb6AtFKiQiHSNbF0EJCElbYhRVY3q5C+VL+++wKIbUTg96tzW3hMWOTyO+OXuJNvb FBDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ALkfhn3QaNrniNePVGIjgtDOKGkOGwVOHVa32KEOksM=; b=nBbI//YRWONZi4Exar6xol64cHZGaOTvj/uOMrV4vulTRPeaeFvkWnTh9WVCD4/eTY mCwMyGYincrrpqMAaBuonyxIH2nA9EqQbXyYx+pYLUT5ZX+qCbYSvFmoNEaeZPh/o3sB NVlEp+iUr0gutUGSzeCoCmgAg+gEwOAtZqTdUKWDytl3tCes6QcOiL+n5/S+wbjn7Ebt 0zLZt7b/cWAs8H7V25XA01JFpssRAEsK46OEToLKILlHNk+AWY3QZnfZjtWto4ma1uS+ 2yLVuS5iLbXtxoXVZXLsm87TLalOXinH6NVJ8n8kyYYx8vAhxp2v9CkCpIq7ATA/MMqo 6zTw== X-Gm-Message-State: AGi0PuboMKCJhD3tqk+2bG2XmbItdpCdRoKusvEGIJbqyFnN/yza8WPV ZznIfGb2OeQEibASqvGJ5K5mLYom X-Google-Smtp-Source: APiQypJ0hbH2WmhCkeZX11BVg7+7yMl66mUbCyzIK55wvEioyePz5+DiUZc6ndCkrvtGpX+R4YKadw== X-Received: by 2002:a2e:7610:: with SMTP id r16mr13946768ljc.156.1587975551930; Mon, 27 Apr 2020 01:19:11 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:11 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 09/21] drm/bridge: tc358767: make connector creation optional Date: Mon, 27 Apr 2020 10:18:38 +0200 Message-Id: <20200427081850.17512-10-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Display drivers are in the new model expected to create the connector using drm_bridge_connector_init(). Allow users of this bridge driver to support the new model by introducing support for optional connector creation. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/tc358767.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 42a153bcde64..991e7d67b692 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1420,8 +1420,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge, } if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); - return -EINVAL; + return 0; } /* Create DP/eDP connector */ From patchwork Mon Apr 27 08:18:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511493 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5317215E6 for ; Mon, 27 Apr 2020 08:19:59 +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 3197A2087E for ; Mon, 27 Apr 2020 08:19:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="doMLDeyc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3197A2087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 792876E0E9; Mon, 27 Apr 2020 08:19:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D238E6E0A1 for ; Mon, 27 Apr 2020 08:19:14 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id u6so16570907ljl.6 for ; Mon, 27 Apr 2020 01:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pZep/jY/+EyVfLfw+h1sXnkYCb03QU2cHUNH9eRWjGo=; b=doMLDeyc0qTYyRN3nrWhLDiOppXdoPIoXkMcMDCOrKcLXiBBFHTBP7m2+76Q0Upb/m IGzt2Ke7oBNLtIZMLAbsGZ6B0UT16X8jpKqLhhxeaqWKlVeKR4UHbdQLc9DXWD5NydTu 6Nr0eTAVUqYskOaqizmmwynK6ZCcIZFpkfDeE0QxKEC2lqIYcLQZgZQDuzNl5R3yWkfQ i+Q5bsPMfy0pkH8XnqHuSEFIHAruLwMtvDWidooDtO5QlPKmGC451SF7kT92mWK1H7Nq JWvXlvdWo8s9jTxap/+MqSfxb2/9j+ZcmHdI2UEVpJC2RJTLieY67loPRrlavFnS9Z93 v4MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pZep/jY/+EyVfLfw+h1sXnkYCb03QU2cHUNH9eRWjGo=; b=UtQiNtZCbNDiiN+zoErfAmRXGY+D3O5mJxcrPXbYOWHux21tsQ8mcD6x01fdse72xA GxlmNtGgVqHygaKWoupD8uxO/OFwyxDvapFp1K2889xRaIpFU78u5eo/l5ss7ZyvpFLp rA44/jCRePwayjKBrZRNcCHwrCTfKTkITu5gZCflMOokw/4VhUAmAGHyGpiR/KbTGVUS DD5Klr56qnRddWCSEaczJqikh73IOUU0gVHs3JxYJh35VyTuNJTMqI/g6GrFjXoYk7iX +wy4wSplJXCJ1Auu25bVU2bMVSn0PMKzrUdRvTHL+qOHoT9kbm6yiXLOXuAASRJGJHgi fNmQ== X-Gm-Message-State: AGi0Puac+iw/w+4PBEudUb9OuC8RRy1pqW4NYRBefQxuqzDnnFiUPt0e wlBOsaYMywLiMtqQJmhGidvrrZXr X-Google-Smtp-Source: APiQypJfAzHdNPxxayGFz8rgIM2UIvosJ8obtm4ukMNyp4uBEQq4XNcKVeia35Qg34I0HJ6MIYMzwA== X-Received: by 2002:a2e:9255:: with SMTP id v21mr13607178ljg.222.1587975552955; Mon, 27 Apr 2020 01:19:12 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:12 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 10/21] drm/bridge: ti-tpd12s015: make connector creation optional Date: Mon, 27 Apr 2020 10:18:39 +0200 Message-Id: <20200427081850.17512-11-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The ti-tpd12s015 do not create any connector, so ignore the flags argument, just pass it on to the next bridge in the chain. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/ti-tpd12s015.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-tpd12s015.c b/drivers/gpu/drm/bridge/ti-tpd12s015.c index 514cbf0eac75..4f1666422ab2 100644 --- a/drivers/gpu/drm/bridge/ti-tpd12s015.c +++ b/drivers/gpu/drm/bridge/ti-tpd12s015.c @@ -43,9 +43,6 @@ static int tpd12s015_attach(struct drm_bridge *bridge, struct tpd12s015_device *tpd = to_tpd12s015(bridge); int ret; - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) - return -EINVAL; - ret = drm_bridge_attach(bridge->encoder, tpd->next_bridge, bridge, flags); if (ret < 0) From patchwork Mon Apr 27 08:18:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511469 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52DA8912 for ; Mon, 27 Apr 2020 08:19:39 +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 310012087E for ; Mon, 27 Apr 2020 08:19:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vg0Ly9eZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 310012087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C30DF6E0E2; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8A856E0A1 for ; Mon, 27 Apr 2020 08:19:15 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id a21so13706912ljj.11 for ; Mon, 27 Apr 2020 01:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bt7QLXi92zUNaN3f6b0hoOVKRdATOXUeHv3J3k12mc8=; b=vg0Ly9eZybytYRwUereJlSxiVw/LwHnCm/AgIlqHzidqNxKyplJP1aq2QT+W3/xxQc qwuM/YKqJ1h2LHLx56kO6cjb4nK8OgPWWFqRMMls64EFTWxX0oCAoydVVup4X/fK3lLs Nq8KD/fBZsUWowQ0VyNILoFh27YReU6ZL5EBLnKRs6dt5BMCASKhlpCMIrO5b0D7syEn +xA7jgySbqnAG7dLtjT3wBNx/qPJuuK9k1Dy6xroVHjptACAp0dyJ9OR0CiIF5jvuvcK P1MhWuS7yIBeBeoKn7hfAYJ4ZlNPlBaUXOZtUkqEFxlwKrWwExVD7TNsix9IMHvhBw/p v2pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bt7QLXi92zUNaN3f6b0hoOVKRdATOXUeHv3J3k12mc8=; b=hc+WLcJuNkZApBCctpYLtw9eT+k7PDrvwQ/tVdyVSZK9rZhUEXxPpwa1lagHtSOOnC v2GVmRQZnvtCcTxPXqXs+xJD2FyupwVad+XoqPro2YgnNEgM1bNANq3ZT0vre8nuYY1U i1TV5TcWQTzwYWbDCQLMBdUPl1JCVKnEceRxwF1Tx0BZCnU+78cw8wfLa/FIA7eb+H4p iNmlUcyDkTeNJWD8aU/slCg92TX51HGsZ/S936QSpERtukG+2xjdCVsKQRKFDNUr3oNE TW5PmA0+uZNivI287mgxIMa1zOPU/NadzAvVV8ECahTLXFscWi4PlSWuSOr8BH2YLOqJ fvew== X-Gm-Message-State: AGi0Pubh/9tVDd7fhfQ3xp8SuIWMLtC2sNT80vTP407K89ZZk6f+CYs2 eG61zLgtVNTJ45iQcquWm1kSwrcc X-Google-Smtp-Source: APiQypL59dPmXD8K0UE4UFImvYoAXQSDDUqKAnJ4rB5xq+/Y83TJcJpSJHLGheQbL8hq7w19J1dQIQ== X-Received: by 2002:a05:651c:48a:: with SMTP id s10mr12869944ljc.226.1587975553960; Mon, 27 Apr 2020 01:19:13 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:13 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 11/21] drm/bridge: parade-ps8622: add drm_panel_bridge support Date: Mon, 27 Apr 2020 10:18:40 +0200 Message-Id: <20200427081850.17512-12-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for use in a chained setup by replacing direct use of drm_panel with drm_panel_bridge support. Note: the bridge panel will use the connector type from the panel. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/parade-ps8622.c | 46 ++++++++------------------ 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index d789ea2a7fb9..6ab6f60b9091 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -45,7 +45,7 @@ struct ps8622_bridge { struct drm_connector connector; struct i2c_client *client; struct drm_bridge bridge; - struct drm_panel *panel; + struct drm_bridge *panel_bridge; struct regulator *v12; struct backlight_device *bl; @@ -365,11 +365,6 @@ static void ps8622_pre_enable(struct drm_bridge *bridge) DRM_ERROR("fails to enable ps8622->v12"); } - if (drm_panel_prepare(ps8622->panel)) { - DRM_ERROR("failed to prepare panel\n"); - return; - } - gpiod_set_value(ps8622->gpio_slp, 1); /* @@ -399,24 +394,8 @@ static void ps8622_pre_enable(struct drm_bridge *bridge) ps8622->enabled = true; } -static void ps8622_enable(struct drm_bridge *bridge) -{ - struct ps8622_bridge *ps8622 = bridge_to_ps8622(bridge); - - if (drm_panel_enable(ps8622->panel)) { - DRM_ERROR("failed to enable panel\n"); - return; - } -} - static void ps8622_disable(struct drm_bridge *bridge) { - struct ps8622_bridge *ps8622 = bridge_to_ps8622(bridge); - - if (drm_panel_disable(ps8622->panel)) { - DRM_ERROR("failed to disable panel\n"); - return; - } msleep(PS8622_PWMO_END_T12_MS); } @@ -436,11 +415,6 @@ static void ps8622_post_disable(struct drm_bridge *bridge) */ gpiod_set_value(ps8622->gpio_slp, 0); - if (drm_panel_unprepare(ps8622->panel)) { - DRM_ERROR("failed to unprepare panel\n"); - return; - } - if (ps8622->v12) regulator_disable(ps8622->v12); @@ -461,7 +435,7 @@ static int ps8622_get_modes(struct drm_connector *connector) ps8622 = connector_to_ps8622(connector); - return drm_panel_get_modes(ps8622->panel, connector); + return drm_bridge_get_modes(ps8622->panel_bridge, connector); } static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = { @@ -482,6 +456,9 @@ static int ps8622_attach(struct drm_bridge *bridge, struct ps8622_bridge *ps8622 = bridge_to_ps8622(bridge); int ret; + ret = drm_bridge_attach(ps8622->bridge.encoder, ps8622->panel_bridge, + &ps8622->bridge, flags); + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { DRM_ERROR("Fix bridge driver to make connector optional!"); return -EINVAL; @@ -505,9 +482,6 @@ static int ps8622_attach(struct drm_bridge *bridge, drm_connector_attach_encoder(&ps8622->connector, bridge->encoder); - if (ps8622->panel) - drm_panel_attach(ps8622->panel, &ps8622->connector); - drm_helper_hpd_irq_event(ps8622->connector.dev); return ret; @@ -515,7 +489,6 @@ static int ps8622_attach(struct drm_bridge *bridge, static const struct drm_bridge_funcs ps8622_bridge_funcs = { .pre_enable = ps8622_pre_enable, - .enable = ps8622_enable, .disable = ps8622_disable, .post_disable = ps8622_post_disable, .attach = ps8622_attach, @@ -533,16 +506,23 @@ static int ps8622_probe(struct i2c_client *client, { struct device *dev = &client->dev; struct ps8622_bridge *ps8622; + struct drm_bridge *pbridge; + struct drm_panel *panel; int ret; ps8622 = devm_kzalloc(dev, sizeof(*ps8622), GFP_KERNEL); if (!ps8622) return -ENOMEM; - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &ps8622->panel, NULL); + ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, NULL); if (ret) return ret; + pbridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(pbridge)) + return PTR_ERR(pbridge); + + ps8622->panel_bridge = pbridge; ps8622->client = client; ps8622->v12 = devm_regulator_get(dev, "vdd12"); From patchwork Mon Apr 27 08:18:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511479 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84663912 for ; Mon, 27 Apr 2020 08:19:46 +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 6006E21973 for ; Mon, 27 Apr 2020 08:19:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jsEFbxON" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6006E21973 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92FE26E0DF; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68C6A6E0A1 for ; Mon, 27 Apr 2020 08:19:17 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id h6so13099929lfc.0 for ; Mon, 27 Apr 2020 01:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JbnoAHGZaTXqPBiG5vvO2Tfv7AKD99Fb4s4aJXa+MvA=; b=jsEFbxONISQUV0yZTKa6zckhW+uRy3lhW6a6UJ74lBNlcFJ6vgEjOuP2puIJBkDIhS Ti3pftPDRQsUysm3Y2g/R0k6zRPEqiF2i1mjUZo6k/zNwVbAQyHCFjEmGPaVRvec6Zkb aU8zfA/S/NsebXqxAtjbp79voBqPliyeVM3fVF49kyOLM1j8kJUU1T0LHLHWJWqo8ZGP TrjYA2m2DiDqde8L10Y6OuLq6srfFiqhUirGbcJiHCnXv0XUXOaiopuJxrfcuXLqlZrJ h4uotWmzcuJgxc8+fPPhaq/69uuXlV2Oteb1bNPL0xWE7+w9Eoa/ByevMes5izhuCkVh 0UxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JbnoAHGZaTXqPBiG5vvO2Tfv7AKD99Fb4s4aJXa+MvA=; b=uoA0LESOQTsA9rIGrrpGDH07RqJMjsforKKLd47DkruDCguHDisazT082yFNe//Vyk O+cn0yfaQgsuuJH7b1R0S8dbTxTMuhIC4cFm1YEYEjFTRgVpI0FgnFKTpljZpnwwH8T9 vxIA7ZvYzICtEK3Pjpi1uMt97iibhV3SSC1zsXCEpE9Z9gJsi/tOzMxs67YRz/NBA07j 4kNNcseG6Y9nYdgJmKd34NnJvhMriWBr9gnoMZoJRs1Ns737NhiPovER7SCeoQw3nRe9 JvD83o15krsV/4UUFViixFX6RXvtZQTnUl55EiTo5ET9cCw4HvOgSIvk8IT4SacK+HBW zyKA== X-Gm-Message-State: AGi0PuZF0dWzXQrr0umTDijrvhx/YcxR1DNIfZAgUWARztdWDTZ0kX7I GUnkrxp4llciM548eJddTX4gvVyt X-Google-Smtp-Source: APiQypIYD7kMtP2IMoYmK89KfZ/Fx1Yqv+ir7gglTryc5Cep5qcRhJds2IEuwUJfiB6Ewt1lZBUm3Q== X-Received: by 2002:a19:f806:: with SMTP id a6mr14846036lff.201.1587975555566; Mon, 27 Apr 2020 01:19:15 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:15 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 12/21] drm/bridge: parade-ps8622: make connector creation optional Date: Mon, 27 Apr 2020 10:18:41 +0200 Message-Id: <20200427081850.17512-13-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Make the connector creation optional to enable usage of the parade-ps8622 bridge with the DRM bridge connector helper. This change moves drm_helper_hpd_irq_event() call in the attach function up before the connector creation. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/parade-ps8622.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 6ab6f60b9091..54aa5270d2c9 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -459,10 +459,8 @@ static int ps8622_attach(struct drm_bridge *bridge, ret = drm_bridge_attach(ps8622->bridge.encoder, ps8622->panel_bridge, &ps8622->bridge, flags); - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); - return -EINVAL; - } + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) + return 0; if (!bridge->encoder) { DRM_ERROR("Parent encoder object not found"); @@ -482,7 +480,7 @@ static int ps8622_attach(struct drm_bridge *bridge, drm_connector_attach_encoder(&ps8622->connector, bridge->encoder); - drm_helper_hpd_irq_event(ps8622->connector.dev); + drm_helper_hpd_irq_event(ps8622->bridge.dev); return ret; } From patchwork Mon Apr 27 08:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B933B912 for ; Mon, 27 Apr 2020 08:20:06 +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 973C0214D8 for ; Mon, 27 Apr 2020 08:20:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L/1pHaJo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 973C0214D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AF876E0EA; Mon, 27 Apr 2020 08:20:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 816CA6E0A1 for ; Mon, 27 Apr 2020 08:19:18 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id a21so13707041ljj.11 for ; Mon, 27 Apr 2020 01:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vjzXQBVoXNlOPYoRpuXxrwu9NjBWZwX5wQQr4dUxZ/0=; b=L/1pHaJo+y7Pf9RDiaOmD5KWDnMF3o4aB16KZWanEL+C/Zxr+95Cqw0vzzRuFYRNZJ bYsMLE/oR9DClpsvtJyjJnGHXlR0puAk09u4fayX/+KPPOjnLcncvsgQOntXRLeuSnUi Z1JCgzeyhwT25qVmzOXpkc64/qqz4W7mt+QdW2fUnbY8J5oM0KWnykFptf3EnQr+EDnB HgmsvHxKydRgKBWMOAp2ot1uKof07NxMmS5GieLlSPauhIOiJJ7d1EBAoa+EbzeY0ega 97U5S9QD5hqHK5gcorxqd9MOFUU2vZwN11VYIBz87p1w/tg7W/TClDIT6ynPdazc8eys QzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vjzXQBVoXNlOPYoRpuXxrwu9NjBWZwX5wQQr4dUxZ/0=; b=AN0PcaNVTRlQLjxVpSQBG412FHwIvWgae0Lhvkd0dlROgvFMpAoKzF63D97HHWns6K WadbX007OBqStDTk8/yGBONVOSNIts9nydKpg5TgnDPs3QqrKuM1BCRxkHQIkppbVWk8 7nvEmFh7Vpbb49DAMLSxokkeJqDVfNu6uyePbXLsW7vm1mAGc1tzdxXQf5ke/RWUf6j/ 6oBvZkqtVuK6FiicrJyzvPCYK2J0ISz3d8/gnqOpAqXwlmOWZTqWVg4elqkL5jD6787P iYAbAiVoicPs9TNYzTMVca9oXwqhAEu5gOIQFvq/T2STBTYZ6WYWNYmXVvqHyjMWTCJ6 i/WQ== X-Gm-Message-State: AGi0PuYuxgrH8GueUN/SU6+j80xTDej64AHr2vdhRel6VZBnBX9WmoI0 HS+8RJ8sab7J/GpEJmkP2R2CLOlB X-Google-Smtp-Source: APiQypKtH0Sl5WCbPnb9Iw9oGOxXpFXQzfTpzpOym+yhQgzy/HkoZqbZ0ZJyKAk/KssSlEAenagb+A== X-Received: by 2002:a2e:8549:: with SMTP id u9mr12631452ljj.24.1587975556609; Mon, 27 Apr 2020 01:19:16 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:16 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 13/21] drm/bridge: megachips: add helper to create connector Date: Mon, 27 Apr 2020 10:18:42 +0200 Message-Id: <20200427081850.17512-14-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Factor out connector creation to a small helper function. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 6200f12a37e6..258e0525cdcc 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -191,6 +191,32 @@ static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; +static int ge_b850v3_lvds_create_connector(struct drm_bridge *bridge) +{ + struct drm_connector *connector = &ge_b850v3_lvds_ptr->connector; + int ret; + + if (!bridge->encoder) { + DRM_ERROR("Parent encoder object not found"); + return -ENODEV; + } + + connector->polled = DRM_CONNECTOR_POLL_HPD; + + drm_connector_helper_add(connector, + &ge_b850v3_lvds_connector_helper_funcs); + + ret = drm_connector_init(bridge->dev, connector, + &ge_b850v3_lvds_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret) { + DRM_ERROR("Failed to initialize connector with drm\n"); + return ret; + } + + return drm_connector_attach_encoder(connector, bridge->encoder); +} + static irqreturn_t ge_b850v3_lvds_irq_handler(int irq, void *dev_id) { struct i2c_client *stdp4028_i2c @@ -209,7 +235,6 @@ static irqreturn_t ge_b850v3_lvds_irq_handler(int irq, void *dev_id) static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) { - struct drm_connector *connector = &ge_b850v3_lvds_ptr->connector; struct i2c_client *stdp4028_i2c = ge_b850v3_lvds_ptr->stdp4028_i2c; int ret; @@ -219,25 +244,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, return -EINVAL; } - if (!bridge->encoder) { - DRM_ERROR("Parent encoder object not found"); - return -ENODEV; - } - - connector->polled = DRM_CONNECTOR_POLL_HPD; - - drm_connector_helper_add(connector, - &ge_b850v3_lvds_connector_helper_funcs); - - ret = drm_connector_init(bridge->dev, connector, - &ge_b850v3_lvds_connector_funcs, - DRM_MODE_CONNECTOR_DisplayPort); - if (ret) { - DRM_ERROR("Failed to initialize connector with drm\n"); - return ret; - } - - ret = drm_connector_attach_encoder(connector, bridge->encoder); + ret = ge_b850v3_lvds_create_connector(bridge); if (ret) return ret; From patchwork Mon Apr 27 08:18:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511499 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E168912 for ; Mon, 27 Apr 2020 08:20: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 F0DA020661 for ; Mon, 27 Apr 2020 08:20:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HgTRtFgR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0DA020661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D65576E0F9; Mon, 27 Apr 2020 08:20:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C62A6E0A1 for ; Mon, 27 Apr 2020 08:19:20 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id l19so16583900lje.10 for ; Mon, 27 Apr 2020 01:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=330R+YmN8ny9O6IcJx2nTrsJRAnoGTicuiHbeLo8iOM=; b=HgTRtFgRTqd2A/KKWWN+mvaw5UobD8OXqbW0VjUIiazWo9nJD8ct4ETds3sk67SvNo ZKtIqwnhIjN3SCpK2kxDBPHOIEpDimPZZDidPlHUjauMMuZFdde1rAkZ+CP9XoLb0H11 hMtBz32BjFFDS8OZ0NFSZAgw1mFyasVbQ3LW1EUJZOtnbWmClWODqRFE8TFk8yeoVURZ FOMQOnid5ckvX/yRG/tVmIG7qg1qnJGt5XAEuM+blb1WWdIYtedZmatwmnoO34YzL3M4 44GeFfiM55nw00TWG3vzyd6eY1RUVdZ+6uQHXz94UkPajY6YpLFgUu+iTPWCnxiUVfk7 sy4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=330R+YmN8ny9O6IcJx2nTrsJRAnoGTicuiHbeLo8iOM=; b=HYHG9BsTbyGBu5iS9ke220GyrmIP1DaIyMRPPqJBRtn/wMxRgF39ccji56xeNibxoA /NRZ/0FbCyZTdcxYM1Wm/A5UejBF2GUR3OsQKOWCE0MIk+2c5YuC4OfyP0FS325njEW9 L33ueIjr5MFORrZv2S37SOKF/8uMPGlszYahApAnhTu7GX5vawMxUTLysdKu2v36R7z5 iPtqCWCKhDREIN4XH8yXM+vJu1QXcPEb1UDzrzqaz0r4vvCspRHNHyNielKctvA4ERWY vtA7PLgKDOriH00kn4MMtPKYbfCHLPQprDtFhdMP3YUl9F8toVGFqRPunctme4+sPhpl BIbw== X-Gm-Message-State: AGi0PubwvqqjgW8LRsANxVuw2reO/ni6WZO0ZEa5zBDvDD2FOSLQSW8P dDjUzRy8E1F5nVstNsoiIL5i33gz X-Google-Smtp-Source: APiQypKayQIfGpl++9bW9sFShLZ711Q+sA2H62/+WrcC56VTYa3j6UbCGU7xL44o7Liwfr9s5cHOcw== X-Received: by 2002:a05:651c:32e:: with SMTP id b14mr13596309ljp.277.1587975558716; Mon, 27 Apr 2020 01:19:18 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:17 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 14/21] drm/bridge: megachips: get drm_device from bridge Date: Mon, 27 Apr 2020 10:18:43 +0200 Message-Id: <20200427081850.17512-15-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix so drm_device is read from the bridge. This is a preparation for the connector being optional. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 258e0525cdcc..cf1dfbc88acf 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -226,8 +226,8 @@ static irqreturn_t ge_b850v3_lvds_irq_handler(int irq, void *dev_id) STDP4028_DPTX_IRQ_STS_REG, STDP4028_DPTX_IRQ_CLEAR); - if (ge_b850v3_lvds_ptr->connector.dev) - drm_kms_helper_hotplug_event(ge_b850v3_lvds_ptr->connector.dev); + if (ge_b850v3_lvds_ptr->bridge.dev) + drm_kms_helper_hotplug_event(ge_b850v3_lvds_ptr->bridge.dev); return IRQ_HANDLED; } From patchwork Mon Apr 27 08:18:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511507 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35D89912 for ; Mon, 27 Apr 2020 08:20:19 +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 143FD206D4 for ; Mon, 27 Apr 2020 08:20:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XiIObgnM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 143FD206D4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C38B56E11E; Mon, 27 Apr 2020 08:20:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 93B916E0A1 for ; Mon, 27 Apr 2020 08:19:21 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id u6so16571228ljl.6 for ; Mon, 27 Apr 2020 01:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JRjCsCOLv/8Q3+8X5xaekVJTggWTYFdPo6SBBlHW/8A=; b=XiIObgnMqpaRwncCn9IoRFMRlRR8YsG1sLe+hCH7j2GoTRMPOVRqujHLttTpV9e/Ja w9lbhHSEnJffSpYTalVylCL6AeYn2nLnY65R6oF0nVyUuk2mM4eCFxH57A1YUNM2jwsA +O1f5LeDxcZrC5YUk/MYyJuDxqVwYJSNO8d7uLxREHofTnZXrN9J5gODI4sJ2D4jT47r VJcdzJjwNZcEn/snjcTitGhFatx7uluuDbAP5AMhQ2YsrZp5J1ONNAj7+lkVSYNpBSQm saKs6L2pJuPWIE+tW4pIAMcNE1CpZFBNJVwpRaDGWrr00RbHN25UIcy6mU0YsnocIsHZ IPdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JRjCsCOLv/8Q3+8X5xaekVJTggWTYFdPo6SBBlHW/8A=; b=LKF/NZKpBOWq9SS0KJAdQxObFOOK4yPgaqJzpo6ihRqt57aQ+jhIfTlgnokSypqTug zONZ72lvYU/xDur8Ozv0rHsFN4fx0X0e6RHEB629QGd1/5TXes5906zzgh870XDVCwn9 4lNL1urfqDsbYzpA6bFJ7brpzn3kC515nRPi1Fi7NBtl9BbLkc9EjS4TIHx8wGKiZ6JV b6zbCfF94Pph1GyFLYnKNx0uSZRHKv3yWRcAeY6MiaT2OCZqFAj224Zdpt/QPnuZOq91 wqaeZ13H0wbPAGbe2c9+ZD2J9JgY47aCe81lEU8A98bZRSeh657EPM8aeQh/PSIWlIBP 5hiA== X-Gm-Message-State: AGi0PuYmawxROEXPs2LnSAKIi9MeaoOBueZA8UnGdVgPG8xQHhDl3MMD TtEL5FAxEfjDnOPbZu2/O+VUBfVl X-Google-Smtp-Source: APiQypKGuFxRLJcLYO86s3L1rQr8s/2UBCZd50C2JT4mKtQlwmVu1BDtHU4bFZXpHCjGgeMllQfG0g== X-Received: by 2002:a2e:b885:: with SMTP id r5mr9665816ljp.118.1587975559737; Mon, 27 Apr 2020 01:19:19 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:19 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 15/21] drm/bridge: megachips: enable detect bridge operation Date: Mon, 27 Apr 2020 10:18:44 +0200 Message-Id: <20200427081850.17512-16-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To prepare for use in a chained bridge setup enable the detect operation. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index cf1dfbc88acf..78a9afe8f063 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -163,8 +163,8 @@ drm_connector_helper_funcs ge_b850v3_lvds_connector_helper_funcs = { .mode_valid = ge_b850v3_lvds_mode_valid, }; -static enum drm_connector_status ge_b850v3_lvds_detect( - struct drm_connector *connector, bool force) +static enum drm_connector_status ge_b850v3_lvds_bridge_detect( + struct drm_bridge *bridge) { struct i2c_client *stdp4028_i2c = ge_b850v3_lvds_ptr->stdp4028_i2c; @@ -182,6 +182,12 @@ static enum drm_connector_status ge_b850v3_lvds_detect( return connector_status_unknown; } +static enum drm_connector_status ge_b850v3_lvds_detect( + struct drm_connector *connector, bool force) +{ + return ge_b850v3_lvds_bridge_detect(&ge_b850v3_lvds_ptr->bridge); +} + static const struct drm_connector_funcs ge_b850v3_lvds_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .detect = ge_b850v3_lvds_detect, @@ -263,6 +269,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, static const struct drm_bridge_funcs ge_b850v3_lvds_funcs = { .attach = ge_b850v3_lvds_attach, + .detect = ge_b850v3_lvds_bridge_detect, }; static int ge_b850v3_lvds_init(struct device *dev) @@ -317,6 +324,7 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, /* drm bridge initialization */ ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs; + ge_b850v3_lvds_ptr->bridge.ops = DRM_BRIDGE_OP_DETECT; ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node; drm_bridge_add(&ge_b850v3_lvds_ptr->bridge); From patchwork Mon Apr 27 08:18:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9362F15E6 for ; Mon, 27 Apr 2020 08:19:43 +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 71ED92087E for ; Mon, 27 Apr 2020 08:19:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u+0Z8JI/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71ED92087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C8C76E0DE; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00E1B6E0A1 for ; Mon, 27 Apr 2020 08:19:22 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id 131so13019739lfh.11 for ; Mon, 27 Apr 2020 01:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=79dXfgAO/1oeiD7HqNr2rl3zX6hL5WsuZP7mG8zOV0A=; b=u+0Z8JI/IfLl23SikUEORaI8awTUnccAPh6UAuR3FExC+FwLvcmbzXGE8JSeZLIYFP D/Ny+b+yR7CwkEH+DT+Pkg5nEZs2EhWNqdIRt2T8jqlIBb7XR6SqlPHvzGXtV/Q0EglM Yp26q6WlrfjQf/JsydbGA4ZGs/MSZ6FmBqkcSPqMvpH6jaQpF7jC2PPKrrRlSmAmP1dz f6fAEr56XgEGBzsSU//uN2deEQexMdwTfksYMqpYAKObu/hxNSwA23BqXg+3IaKcXSVK jdRpzSzZiBPACfuBuV5NvwvnFGfUqByFFL9Jc7j+owvZm+sQxFXvKsFX118sqcNy2Nbz byIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=79dXfgAO/1oeiD7HqNr2rl3zX6hL5WsuZP7mG8zOV0A=; b=suejGi3pa77X6zkG3XAA1e7OHtbkVAE+Lv6xiQz+4FBxtgKLGf0i3eu0MMTUDtsp/u ZUOmKAMlg4uX89cGjgsWI/x7zdgunvYnU7nnN4YHVcrrMREuqvmhHidpx/Ourk0QcQBK rS84AHlcpyV0I0n6zukALbSPAazrFto+aXryL3lAfCgO+AVTaVK5SNth7sd6NRgS8T/8 mUPEqlX/Udu0dcGj3pbGw7UXJ7bB7nE8wZZdU5TPmDpeZ8sdQ3ddgdRSwLaDZzNMbO7N DJD31ae/05GNBCxM4fJgoU2EshCw9+ydRIO5d26GPA3vo0Jl2eRvsbNRzHkfM6+0y5Jj 6DEg== X-Gm-Message-State: AGi0PuZEyp7SboOPzSbEBb2bxDTDTuK9nRQns1CRMHkL0h6nSz0ap45j fBbTL+Giti/TnyfObxaW5AvHAnp3 X-Google-Smtp-Source: APiQypKcE2YQtyGmXP5WvG0cnCGoRA44KeQryFmGOFdH5dVOUGByCXawHSUh85tXab533A7D6bXn4w== X-Received: by 2002:a19:8a:: with SMTP id 132mr14437209lfa.139.1587975561090; Mon, 27 Apr 2020 01:19:21 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:20 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 16/21] drm/bridge: megachips: add get_edid bridge operation Date: Mon, 27 Apr 2020 10:18:45 +0200 Message-Id: <20200427081850.17512-17-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To prepare for a chained bridge setup add support for the get_edid bridge operation. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 78a9afe8f063..5f06e18f0a61 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -131,21 +131,29 @@ static u8 *stdp2690_get_edid(struct i2c_client *client) return NULL; } -static int ge_b850v3_lvds_get_modes(struct drm_connector *connector) +static struct edid *ge_b850v3_lvds_get_edid( + struct drm_bridge *bridge, struct drm_connector *connector) { struct i2c_client *client; - int num_modes = 0; client = ge_b850v3_lvds_ptr->stdp2690_i2c; kfree(ge_b850v3_lvds_ptr->edid); ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client); - if (ge_b850v3_lvds_ptr->edid) { - drm_connector_update_edid_property(connector, - ge_b850v3_lvds_ptr->edid); - num_modes = drm_add_edid_modes(connector, - ge_b850v3_lvds_ptr->edid); + return ge_b850v3_lvds_ptr->edid; +} + +static int ge_b850v3_lvds_get_modes(struct drm_connector *connector) +{ + struct edid *edid; + int num_modes = 0; + + edid = ge_b850v3_lvds_get_edid(&ge_b850v3_lvds_ptr->bridge, connector); + + if (edid) { + drm_connector_update_edid_property(connector, edid); + num_modes = drm_add_edid_modes(connector, edid); } return num_modes; @@ -270,6 +278,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, static const struct drm_bridge_funcs ge_b850v3_lvds_funcs = { .attach = ge_b850v3_lvds_attach, .detect = ge_b850v3_lvds_bridge_detect, + .get_edid = ge_b850v3_lvds_get_edid, }; static int ge_b850v3_lvds_init(struct device *dev) @@ -324,7 +333,8 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c, /* drm bridge initialization */ ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs; - ge_b850v3_lvds_ptr->bridge.ops = DRM_BRIDGE_OP_DETECT; + ge_b850v3_lvds_ptr->bridge.ops = DRM_BRIDGE_OP_DETECT | + DRM_BRIDGE_OP_EDID; ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node; drm_bridge_add(&ge_b850v3_lvds_ptr->bridge); From patchwork Mon Apr 27 08:18:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511501 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ADA5515E6 for ; Mon, 27 Apr 2020 08:20:13 +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 8C01020661 for ; Mon, 27 Apr 2020 08:20:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="els4jAlp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C01020661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7067B6E0FC; Mon, 27 Apr 2020 08:20:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CC0C6E0A1 for ; Mon, 27 Apr 2020 08:19:24 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id u15so16613688ljd.3 for ; Mon, 27 Apr 2020 01:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ko7ECkbpkrfY4zRKx21hcLUoTE3ne5ZVCyMO+vbIqD8=; b=els4jAlplL1YN1+7Ymn7N99XGmW60iCbzDoo3MReeet8oHMQl/ORWvvv+8Yj2oab91 nE87K83GiVlBjYOMA0mrp2Y7k1mdQwDxGtsqe9HUiBLpuxGXujszOxxbLgZo6fanTIAI sa+tcc8v6m0/MMgl7z6LNVSNZu5H2ezw7GZ29Sx7BzqqTkq9EKfWzv6x0MAESUX3GWML Ft+RXkXl96ON7a4GjZOfj6f2v7b3yPogJSToV61VyyC1oFiJYbwRKLlHmWaZamEU2YdC knbl0sMg9vCd1BGp6cOW5pbrDC/7fBL2lIUrTI9b7clfutlt/uNmhjZimU1Llw7AN4Dz 9hLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ko7ECkbpkrfY4zRKx21hcLUoTE3ne5ZVCyMO+vbIqD8=; b=nV0O5FdASiPpxcZUT5iAI2NLy7op71C+4odOxX69U8BZRiwTvTOLRAX2lSFoZ3CzBp +6HctCtd4T0s0k17q+MSlV/0xOwHMotLjLegrtcFDL4cvMnBNdRU2kGFt794Y5XfSW4Q PXyiEcmO7MuhDHDV+drUT7we4hwsNBPbb27SE01YT0V326mMspoKmWPLgKBIBqAh5I8X 1U8O3tmVaEolAGSQdUZ4GgtdmxH34ayjhwdRula1SRnVX82ddf7ZQl436ewIN4sxbwIa Vl+c0t89I9RIJYHv1sMuaa9wmm2zYf3GYibgooGI9ZXojYK/fQwZZ0UWXDoZuta2F9G1 h/NA== X-Gm-Message-State: AGi0Pua+dMjrX/uHtwb1axfZPS1aGijx2NflKq4Mp6+hXWLOWOuEApvi n1M+11eDBYFgwX6paSQPnaN14wta X-Google-Smtp-Source: APiQypLoJvNFvtfW4LTmWbf2iV70ATmDA81pckGQq7lyU4lWS/z80rZa36RBaNum6PWTb2LesSMC2Q== X-Received: by 2002:a2e:9207:: with SMTP id k7mr13520918ljg.124.1587975562137; Mon, 27 Apr 2020 01:19:22 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:21 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 17/21] drm/bridge: megachips: make connector creation optional Date: Mon, 27 Apr 2020 10:18:46 +0200 Message-Id: <20200427081850.17512-18-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Make the connector creation optional to enable usage of the megachips-stdpxxxx-ge-b850v3-fw bridge with the DRM bridge connector helper. Signed-off-by: Sam Ravnborg Cc: Peter Senna Tschudin Cc: Martin Donnelly Cc: Martyn Welch Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 5f06e18f0a61..991417ab35b6 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c @@ -251,16 +251,6 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, { struct i2c_client *stdp4028_i2c = ge_b850v3_lvds_ptr->stdp4028_i2c; - int ret; - - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); - return -EINVAL; - } - - ret = ge_b850v3_lvds_create_connector(bridge); - if (ret) - return ret; /* Configures the bridge to re-enable interrupts after each ack. */ i2c_smbus_write_word_data(stdp4028_i2c, @@ -272,7 +262,10 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge, STDP4028_DPTX_IRQ_EN_REG, STDP4028_DPTX_IRQ_CONFIG); - return 0; + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) + return 0; + + return ge_b850v3_lvds_create_connector(bridge); } static const struct drm_bridge_funcs ge_b850v3_lvds_funcs = { From patchwork Mon Apr 27 08:18:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511497 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE351912 for ; Mon, 27 Apr 2020 08:20:10 +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 B87B92087E for ; Mon, 27 Apr 2020 08:20:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dSKE53MZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B87B92087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF47E6E0FB; Mon, 27 Apr 2020 08:20:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB05C6E0A1 for ; Mon, 27 Apr 2020 08:19:26 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id t11so13030734lfe.4 for ; Mon, 27 Apr 2020 01:19:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o5DJmdQFZpMVKr/FQEUxXPMg63d8Tk7lytsgMLwwR3s=; b=dSKE53MZfVaKlP7T5UuteccYi9Mxj3V9rpmMOAGuyGTp9mAHpebXts8J3jOzM9syEd e1VPJNz401DjJKV+0rw0ayFa7+xuxYCLIKkqs/BlaE1tb+TeIxlzTYYCTdln6UF84Dst P4IDY3Oz1sk3dfcv1dMCsmdoYm2Isc2v8nQ4ejwJUx9MQIIcp1XflulCiefWRxg0U3pZ +1rzK440kaLcC3t5hsA5nr4J29AqHab/lHgYnKSwKKdNvxfjp23b5EsqfOxXBUhMGime +p4NbhH4ny1m69Ze9S/Oz4vxX1SXiXE4KlPZ5TopIWswv8jwIEz4aGqlDx2F64Vjqz7f ZXHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=o5DJmdQFZpMVKr/FQEUxXPMg63d8Tk7lytsgMLwwR3s=; b=CfDzUwqVxxFpgalzAqvvtvvi6hT0suczFhXLhMB1361pcqkUC/ehz0+y2bRS5Gxfay MpfkcVW+zj+ip7mbLUHpmgZ3Jc0c8Oc+1sftxCtTnrloaJb1sEPFb+U7aBZU/ajOP/2B FQrlXoOOpxNmeIwu88M8tKr+GNheLLJaY4M8oTWjiXgwi+PxCMQasdptr0c2OOCy+Lfw 8S5glbcUN7NQqhkzRfYIbSmnzLbP7/wmPbjNI2rAzDurqTyIAwPO88q80yA4nOHh0E0B CAhk3RtJs8UdQUUWY/mmrkCCczSRKlWGEYCCtx6gR6/m/XfDyY7uhLC1foZHQlTOdjfx 7usA== X-Gm-Message-State: AGi0PubdwB5eUCig6ZHnrQuAxCMnFR5X0RuWles1zf76W8vUjK2f56hi aiXIJ+eYOe6fWR7qnPg2vymxkjb2 X-Google-Smtp-Source: APiQypIuKuAgR+jezkYXHdlW7DQEQcK2psqgGs7oNqrV/Hh5eN6CwFMRt/erKiJdYaNlkyIM7zZxtg== X-Received: by 2002:ac2:4a76:: with SMTP id q22mr14737001lfp.157.1587975564890; Mon, 27 Apr 2020 01:19:24 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:23 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 18/21] drm/bridge: nxp-ptn3460: add drm_panel_bridge support Date: Mon, 27 Apr 2020 10:18:47 +0200 Message-Id: <20200427081850.17512-19-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for use in a chained setup by replacing direct use of drm_panel with drm_panel_bridge support. Note: the bridge panel will use the connector type from the panel. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/nxp-ptn3460.c | 51 ++++++++-------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index 438e566ce0a4..0bd9f0e451b3 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -30,7 +30,7 @@ struct ptn3460_bridge { struct i2c_client *client; struct drm_bridge bridge; struct edid *edid; - struct drm_panel *panel; + struct drm_bridge *panel_bridge; struct gpio_desc *gpio_pd_n; struct gpio_desc *gpio_rst_n; u32 edid_emulation; @@ -127,11 +127,6 @@ static void ptn3460_pre_enable(struct drm_bridge *bridge) usleep_range(10, 20); gpiod_set_value(ptn_bridge->gpio_rst_n, 1); - if (drm_panel_prepare(ptn_bridge->panel)) { - DRM_ERROR("failed to prepare panel\n"); - return; - } - /* * There's a bug in the PTN chip where it falsely asserts hotplug before * it is fully functional. We're forced to wait for the maximum start up @@ -146,16 +141,6 @@ static void ptn3460_pre_enable(struct drm_bridge *bridge) ptn_bridge->enabled = true; } -static void ptn3460_enable(struct drm_bridge *bridge) -{ - struct ptn3460_bridge *ptn_bridge = bridge_to_ptn3460(bridge); - - if (drm_panel_enable(ptn_bridge->panel)) { - DRM_ERROR("failed to enable panel\n"); - return; - } -} - static void ptn3460_disable(struct drm_bridge *bridge) { struct ptn3460_bridge *ptn_bridge = bridge_to_ptn3460(bridge); @@ -165,25 +150,10 @@ static void ptn3460_disable(struct drm_bridge *bridge) ptn_bridge->enabled = false; - if (drm_panel_disable(ptn_bridge->panel)) { - DRM_ERROR("failed to disable panel\n"); - return; - } - gpiod_set_value(ptn_bridge->gpio_rst_n, 1); gpiod_set_value(ptn_bridge->gpio_pd_n, 0); } -static void ptn3460_post_disable(struct drm_bridge *bridge) -{ - struct ptn3460_bridge *ptn_bridge = bridge_to_ptn3460(bridge); - - if (drm_panel_unprepare(ptn_bridge->panel)) { - DRM_ERROR("failed to unprepare panel\n"); - return; - } -} - static int ptn3460_get_modes(struct drm_connector *connector) { struct ptn3460_bridge *ptn_bridge; @@ -242,6 +212,11 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge, struct ptn3460_bridge *ptn_bridge = bridge_to_ptn3460(bridge); int ret; + ret = drm_bridge_attach(bridge->encoder, ptn_bridge->panel_bridge, + bridge, flags); + if (ret < 0) + return ret; + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { DRM_ERROR("Fix bridge driver to make connector optional!"); return -EINVAL; @@ -265,9 +240,6 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge, drm_connector_attach_encoder(&ptn_bridge->connector, bridge->encoder); - if (ptn_bridge->panel) - drm_panel_attach(ptn_bridge->panel, &ptn_bridge->connector); - drm_helper_hpd_irq_event(ptn_bridge->connector.dev); return ret; @@ -275,9 +247,7 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge, static const struct drm_bridge_funcs ptn3460_bridge_funcs = { .pre_enable = ptn3460_pre_enable, - .enable = ptn3460_enable, .disable = ptn3460_disable, - .post_disable = ptn3460_post_disable, .attach = ptn3460_bridge_attach, }; @@ -286,6 +256,8 @@ static int ptn3460_probe(struct i2c_client *client, { struct device *dev = &client->dev; struct ptn3460_bridge *ptn_bridge; + struct drm_bridge *pbridge; + struct drm_panel *panel; int ret; ptn_bridge = devm_kzalloc(dev, sizeof(*ptn_bridge), GFP_KERNEL); @@ -293,10 +265,15 @@ static int ptn3460_probe(struct i2c_client *client, return -ENOMEM; } - ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &ptn_bridge->panel, NULL); + ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, &panel, NULL); if (ret) return ret; + pbridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(pbridge)) + return PTR_ERR(pbridge); + + ptn_bridge->panel_bridge = pbridge; ptn_bridge->client = client; ptn_bridge->gpio_pd_n = devm_gpiod_get(&client->dev, "powerdown", From patchwork Mon Apr 27 08:18:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2AFA115E6 for ; Mon, 27 Apr 2020 08:19:42 +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 091932087E for ; Mon, 27 Apr 2020 08:19:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WaPDs1bg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 091932087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 412A96E0D4; Mon, 27 Apr 2020 08:19:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id D72406E0A1 for ; Mon, 27 Apr 2020 08:19:27 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id g10so12985244lfj.13 for ; Mon, 27 Apr 2020 01:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7s05XMTYcFfENek8PsGO4hs1bY+4uIGfZAp5xveEl4A=; b=WaPDs1bg3Poh/6oyeL1gtfefhhVeBACY2UtNFjfEkoUh2duRZFDSCUqoS0XK9gw6GG Yy77WqhsE0W76xIquxttdAIdiPTpcy9oNBCGdXbo6NC2M3u6t/gwcU2c6kp6xR9U1cuD e8TtpSdpc4qVKwjSpFgqDU0VOA++yPfNQx7dXAistwHQaTEeOtsPrisGJ6mpphqNj/m5 hLTLiT/Ce1XLAandpjToqteAv+wDc3zW5Di0G6Pp3/5SaNh94O2Kq/i2c6mgwrlwLqrh 5vFHvyY1DU1ibB11cpnnFNQ9O1Xmkx2dU7CW5JV1v9bJywuUuHbQHSmF3scol5XycjhF bCeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7s05XMTYcFfENek8PsGO4hs1bY+4uIGfZAp5xveEl4A=; b=A5dPSFJOjS363ID5qw7Y754xbp7Q2mHhJKBjvZYKC5VVyb7SKR6bfUOlGcLZ0cvRXL zmSkWkPsIoV6L0CqFHmNnBu0uY2b0FIYdmVDxkIgowog0qYZs2l90YvDsqJNV+sj8cmw 74QlusCpWY36YZeYvvXSKpSt/jxtAuCetUqEcC6o7GqrEjGB3VY+2vgR+y+Uxan2gOgi s2mnMLhJMZxyJlenxvSwSJsUar+NYh+wz89K/sEgiOaJlKAPVnZ7dtsZ9Ogalt1YmRWA Pe5frQTpsdUv2LK8lwUGG510Pw+CbvFz+uBByc7MXSwKkzFBg4n72b4Kkgy4UAlNzaHU OnXQ== X-Gm-Message-State: AGi0PubK9O6ozL1bLazQpzWarKIw8bvZw/zo8wwYa4m3j0dJBSxcSwgT Quc+HtXtBk27h0mCTCK9yW1IQfwK X-Google-Smtp-Source: APiQypLchTDsch3VlYxoKPd8hHqKmZ1fSD86nVzyDaZx7Z9Li1s0kBXhpmMSlLQWguhx9S8ypObZFA== X-Received: by 2002:a19:f518:: with SMTP id j24mr14989307lfb.205.1587975565953; Mon, 27 Apr 2020 01:19:25 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:25 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 19/21] drm/bridge: nxp-ptn3460: add get_modes bridge operation Date: Mon, 27 Apr 2020 10:18:48 +0200 Message-Id: <20200427081850.17512-20-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add the get_modes() bridge operation to prepare for use as a chained bridge. Add helper function that is also used by the connector. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/nxp-ptn3460.c | 52 ++++++++++++++++++---------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index 0bd9f0e451b3..e253c185f94c 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -154,17 +154,13 @@ static void ptn3460_disable(struct drm_bridge *bridge) gpiod_set_value(ptn_bridge->gpio_pd_n, 0); } -static int ptn3460_get_modes(struct drm_connector *connector) +static struct edid *ptn3460_get_edid(struct drm_bridge *bridge, + struct drm_connector *connector) { - struct ptn3460_bridge *ptn_bridge; - u8 *edid; - int ret, num_modes = 0; + struct ptn3460_bridge *ptn_bridge = bridge_to_ptn3460(bridge); bool power_off; - - ptn_bridge = connector_to_ptn3460(connector); - - if (ptn_bridge->edid) - return drm_add_edid_modes(connector, ptn_bridge->edid); + u8 *edid; + int ret; power_off = !ptn_bridge->enabled; ptn3460_pre_enable(&ptn_bridge->bridge); @@ -172,30 +168,46 @@ static int ptn3460_get_modes(struct drm_connector *connector) edid = kmalloc(EDID_LENGTH, GFP_KERNEL); if (!edid) { DRM_ERROR("Failed to allocate EDID\n"); - return 0; + return NULL; } ret = ptn3460_read_bytes(ptn_bridge, PTN3460_EDID_ADDR, edid, - EDID_LENGTH); + EDID_LENGTH); if (ret) { kfree(edid); - goto out; + return NULL; } + if (power_off) + ptn3460_disable(&ptn_bridge->bridge); + + kfree(ptn_bridge->edid); ptn_bridge->edid = (struct edid *)edid; - drm_connector_update_edid_property(connector, ptn_bridge->edid); - num_modes = drm_add_edid_modes(connector, ptn_bridge->edid); + return ptn_bridge->edid; +} -out: - if (power_off) - ptn3460_disable(&ptn_bridge->bridge); +static int ptn3460_connector_get_modes(struct drm_connector *connector) +{ + struct ptn3460_bridge *ptn_bridge; + struct edid *edid; + + ptn_bridge = connector_to_ptn3460(connector); + + if (ptn_bridge->edid) + return drm_add_edid_modes(connector, ptn_bridge->edid); + + edid = ptn3460_get_edid(&ptn_bridge->bridge, connector); + if (!edid) + return 0; + + drm_connector_update_edid_property(connector, edid); - return num_modes; + return drm_add_edid_modes(connector, edid); } static const struct drm_connector_helper_funcs ptn3460_connector_helper_funcs = { - .get_modes = ptn3460_get_modes, + .get_modes = ptn3460_connector_get_modes, }; static const struct drm_connector_funcs ptn3460_connector_funcs = { @@ -249,6 +261,7 @@ static const struct drm_bridge_funcs ptn3460_bridge_funcs = { .pre_enable = ptn3460_pre_enable, .disable = ptn3460_disable, .attach = ptn3460_bridge_attach, + .get_edid = ptn3460_get_edid, }; static int ptn3460_probe(struct i2c_client *client, @@ -304,6 +317,7 @@ static int ptn3460_probe(struct i2c_client *client, } ptn_bridge->bridge.funcs = &ptn3460_bridge_funcs; + ptn_bridge->bridge.ops = DRM_BRIDGE_OP_EDID; ptn_bridge->bridge.of_node = dev->of_node; drm_bridge_add(&ptn_bridge->bridge); From patchwork Mon Apr 27 08:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511481 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 021111667 for ; Mon, 27 Apr 2020 08:19:48 +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 D4FF22087E for ; Mon, 27 Apr 2020 08:19:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y+VCrmei" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4FF22087E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABA666E0E6; Mon, 27 Apr 2020 08:19:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id DED096E0A1 for ; Mon, 27 Apr 2020 08:19:28 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id j3so16559982ljg.8 for ; Mon, 27 Apr 2020 01:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QfDnC/975rlfCbjADEMfc9RfcMZxiMjnJ1FwoN1pIaw=; b=Y+VCrmeiZ2jmM3OhszHVJvbp76bmwxmRZKnIWg9C0NpYYcSYKbOcMjVa3hAZDJJB+c FHeumPFbaYsloZfvNYqUGLq3ebhsytZ848M5pa20j89r+WdufGrijqCh+GJ/4Grrreyb YHmmVE1+bHYw/STqjzbwX00Q4bLZjjqnz/TYWDgmTMjkiUH+rKcg/cHjJbquqrsV/JqH dhe5Was18Ck8dp7iTtZgwgmM7OYI0lIBcsNrbYNsvy9RWRrBuuDWu5EsKszDjPpWji+6 u0Hx0Iv3qrg8R2KQamppyiMCddYY9sv4w48Bf1VdW0Aqnu65MEWa5M3k9OgwSX+pLhCI znqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QfDnC/975rlfCbjADEMfc9RfcMZxiMjnJ1FwoN1pIaw=; b=ieNHOGHQMB3jCdazsKgJAWtbE526Qdb5zkNqOBFcL+gcdk0YhDW0mQE6B1UDk7cDEs DXL+V9rrB7MZT0ARhhxB2VlryThNUKfODxFkHpcAUySPPQ7Pa7E+erQxduimskCSkuE1 qJi67o6cWk87OU9rxoeCus/o2KSpJU7kQghgbUBBMgh5OOvBAWBv1JKoI9tmLV+cRR6+ GiNn1kymDMtNArvrbfuYEW9PoF8h8r1rC/nOzYXSAvRcE/pMhCcUEECebS0zKY5C8wRm LjT12G+OunBpb8D3mUOofYxsI8JerlSuHDie+MI+9kq25flovWtvxq8B5kEkqx5bBSH2 qtqw== X-Gm-Message-State: AGi0PuZDuGb82Qnh/s5I99kmqCn5UIwvkRZ0EpRD+w2qLa4xgliMeiNa lrhTxEqrVQiHBYApOeD8ylNmhhRy X-Google-Smtp-Source: APiQypKr9YrT2I6gRGVcKAknhWnwS9ipPj+2G/YCTbXGTD3J58tEt+QMV6/RHkHYBXYl/ftuHn37Mw== X-Received: by 2002:a2e:9084:: with SMTP id l4mr14159506ljg.132.1587975567063; Mon, 27 Apr 2020 01:19:27 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:26 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 20/21] drm/bridge: nxp-ptn3460: make connector creation optional Date: Mon, 27 Apr 2020 10:18:49 +0200 Message-Id: <20200427081850.17512-21-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Make the connector creation optional to enable usage of the nxp-ptn3460 bridge with the DRM bridge connector helper. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index e253c185f94c..6a65657087f9 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -229,10 +229,8 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge, if (ret < 0) return ret; - if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) { - DRM_ERROR("Fix bridge driver to make connector optional!"); - return -EINVAL; - } + if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) + return 0; if (!bridge->encoder) { DRM_ERROR("Parent encoder object not found"); From patchwork Mon Apr 27 08:18:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11511505 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59CC0912 for ; Mon, 27 Apr 2020 08:20:17 +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 385BD20661 for ; Mon, 27 Apr 2020 08:20:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IFUqPzKm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 385BD20661 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 125D66E102; Mon, 27 Apr 2020 08:20:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FFD36E0A1 for ; Mon, 27 Apr 2020 08:19:30 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id h4so3028618ljg.12 for ; Mon, 27 Apr 2020 01:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MD6Cc48mPqUfbYyIOTQOUtDB50GD6TIAPPTOiyUgFog=; b=IFUqPzKmX6IZN4rxPobZg1QfBIMT+39zySUUXJ4WzlJrcIMXIWCz6Fn66sjE+K2wzi GEOkXcn1ivDShp+UfNbS/tlavfQEQX4R56c7X/tP/5LMrfFscGu3jGuX4ULcb1BUd8kE 0Q2WGLLLewPR1cbY2P5kx4mRAm6iW6MtZvS9IsC2V7UbrZFGABjgkGFH+J6bEtFjVWCH T9VvCo0HshUZ+JgfsGt7O0w+edysvSf+AzvAVJeI9Y/QqPt4XE+BJPBsJ9aLf6vWn6Hl IPgBxHoZiPkjQnADHo7/C81Wz11oJg0I3GeQcAdZSN9Xs5GtYi3CKcVjQb1IO45SPzQg EpKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MD6Cc48mPqUfbYyIOTQOUtDB50GD6TIAPPTOiyUgFog=; b=nlJns8LtwGMmzXBCFy9RIPmaN+HHQl+z1UJB5h4NGsbSUIPCQ/TdHpa4wbGAsFOofV qNrAfqpjtxKMEeth5d+msq70CdCLmA4Babz/pdMoeCoCPhaVaV/Ul9hlGwz6zaGoM8px o4RK7pQeTFWnlimvKAISACmcTa6RwE8bSsKwe+s8UZtQU6eoSOpDtFk2An2ez0tvOYDY 9YBqTNJcWzYX699KUoBSJMq//yae7LKoZsgoMHEetNEa2Nq9OVkynhXSfTtswR8MPV2c 6Lzhxg1h3z8mKCkHlJIs0IbGwoPbOJzTEn14Or9jsGH/emZ9OKtY+W+Jtg14UynXTfI7 zikg== X-Gm-Message-State: AGi0PuZvDdhrel1PPGBdkSIs+DNieSRU7amP1H81/zD1NJOb2QaupUMm j2ZB915PmKD5R5Xd6+isU19vxFZh X-Google-Smtp-Source: APiQypJXVjYRCDY5O7BBbpip/6ZnQNdlD13cxDgrm1jaEWl6SmR4n03rw9RJfwi/KlIF/cJY5QK+HQ== X-Received: by 2002:a2e:920e:: with SMTP id k14mr14204395ljg.288.1587975568186; Mon, 27 Apr 2020 01:19:28 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c20sm9846301ljk.59.2020.04.27.01.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 01:19:27 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Laurent Pinchart , Neil Armstrong Subject: [PATCH v2 21/21] drm/bridge: ti-sn65dsi86: add drm_panel_bridge support Date: Mon, 27 Apr 2020 10:18:50 +0200 Message-Id: <20200427081850.17512-22-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427081850.17512-1-sam@ravnborg.org> References: <20200427081850.17512-1-sam@ravnborg.org> 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: , Cc: Jernej Skrabec , Martyn Welch , Jonas Karlman , Peter Senna Tschudin , Andrzej Hajda , Thierry Reding , Sam Ravnborg , Martin Donnelly Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Prepare the bridge driver for use in a chained setup by replacing direct use of drm_panel with drm_panel_bridge support. Note: the bridge panel will use the connector type from the panel. Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 6ad688b320ae..c306d3069037 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -98,7 +98,7 @@ struct ti_sn_bridge { struct device_node *host_node; struct mipi_dsi_device *dsi; struct clk *refclk; - struct drm_panel *panel; + struct drm_bridge *panel_bridge; struct gpio_desc *enable_gpio; struct regulator_bulk_data supplies[SN_REGULATOR_SUPPLY_NUM]; int dp_lanes; @@ -208,7 +208,7 @@ static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector) { struct ti_sn_bridge *pdata = connector_to_ti_sn_bridge(connector); - return drm_panel_get_modes(pdata->panel, connector); + return drm_bridge_get_modes(pdata->panel_bridge, connector); } static enum drm_mode_status @@ -340,9 +340,8 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, pdata->dsi = dsi; /* attach panel to bridge */ - drm_panel_attach(pdata->panel, &pdata->connector); - - return 0; + return drm_bridge_attach(bridge->encoder, pdata->panel_bridge, + bridge, flags); err_dsi_attach: mipi_dsi_device_unregister(dsi); @@ -355,16 +354,12 @@ static void ti_sn_bridge_disable(struct drm_bridge *bridge) { struct ti_sn_bridge *pdata = bridge_to_ti_sn_bridge(bridge); - drm_panel_disable(pdata->panel); - /* disable video stream */ regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, 0); /* semi auto link training mode OFF */ regmap_write(pdata->regmap, SN_ML_TX_MODE_REG, 0); /* disable DP PLL */ regmap_write(pdata->regmap, SN_PLL_ENABLE_REG, 0); - - drm_panel_unprepare(pdata->panel); } static u32 ti_sn_bridge_get_dsi_freq(struct ti_sn_bridge *pdata) @@ -731,8 +726,6 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) /* enable video stream */ regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, VSTREAM_ENABLE, VSTREAM_ENABLE); - - drm_panel_enable(pdata->panel); } static void ti_sn_bridge_pre_enable(struct drm_bridge *bridge) @@ -762,8 +755,6 @@ static void ti_sn_bridge_pre_enable(struct drm_bridge *bridge) */ regmap_update_bits(pdata->regmap, SN_HPD_DISABLE_REG, HPD_DISABLE, HPD_DISABLE); - - drm_panel_prepare(pdata->panel); } static void ti_sn_bridge_post_disable(struct drm_bridge *bridge) @@ -878,6 +869,8 @@ static int ti_sn_bridge_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct ti_sn_bridge *pdata; + struct drm_bridge *bridge; + struct drm_panel *panel; int ret; if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { @@ -900,12 +893,18 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->dev = &client->dev; ret = drm_of_find_panel_or_bridge(pdata->dev->of_node, 1, 0, - &pdata->panel, NULL); + &panel, NULL); if (ret) { DRM_ERROR("could not find any panel node\n"); return ret; } + bridge = devm_drm_panel_bridge_add(pdata->dev, panel); + if (IS_ERR(bridge)) + return PTR_ERR(bridge); + + pdata->panel_bridge = bridge; + dev_set_drvdata(&client->dev, pdata); pdata->enable_gpio = devm_gpiod_get(pdata->dev, "enable",