Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp361325pxb; Wed, 27 Oct 2021 04:29:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0E4XalbkMnYqxzQLAt4Az3wqt96HqSZ1wXzn0S//eaxsKHmJojcmyfL81+cQ4rr9CGqwy X-Received: by 2002:aa7:db85:: with SMTP id u5mr43471127edt.234.1635334148559; Wed, 27 Oct 2021 04:29:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635334148; cv=none; d=google.com; s=arc-20160816; b=yyAlj05URkkHm94549HkSBxezYjGxcCNdbww6yyaIeEr3QaLUK5sna7RDOoNyPxmCV Aa7X8xBmxZjepKjxor82E58J+eTELpoBvzn0JgUfSCbsBD2yqaR8CyRr1X1gDY3GWS4E YHB1kHx9znEfZlcuiniiF89v00V9DYfb/MTknNBcMdbqZZne4IHhaM6OMKWHKyzTS9zS 6RmSSDF2cMs45sUC8Jd48fuAJBLNWd5sihs8WjMpoNZpcxKq28iCI8FN7torC+MHstTm +bvDjRYMmuoLOwk6LKMXKAZfCy20Jg8UVXUVZ0b84FNa5Gh16RC8+s7GIkU7Z1umqWyB VykQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9F+EWbh01K9eqvh7QO6VrhctGso+L9ps7sX+i8thX2Y=; b=vWNv7EAXdW1Exwyn6gHJS+orQxXVSFhooD6Ncgm9e/anqH18PONaZd44Wpx42Xat0n Kp5IowX2VZuqrqaZaT+TRGhsMLwKaav+ebZbesGCmTuGmmQEAJWGkqM93GIyyNfbwIpl PF/Ul3oBvduVhlaqOMG3CCTjQiZzQCF37iiijqq/+BvYIZj/I4B2sx3+9WE/NTXvshqu sg1Fdg20H4sADUZ+0XzoW0xjcJHZiUZZZ8SlVbObEUlRW+TyUJEOCni9AQQzHZ/HSWB8 bZ0qdLjUW6CeC0Eb32p2KpAtpixKY0arhSQBqOQcZt0LCh8IvItm/41xGuv2KHjD+Xdz okYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Zdc4ztOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s2si47294570edd.68.2021.10.27.04.28.22; Wed, 27 Oct 2021 04:29:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Zdc4ztOZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239720AbhJZV7V (ORCPT + 99 others); Tue, 26 Oct 2021 17:59:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239712AbhJZV7U (ORCPT ); Tue, 26 Oct 2021 17:59:20 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 399F5C061570 for ; Tue, 26 Oct 2021 14:56:56 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id oa12-20020a17090b1bcc00b0019f715462a8so537611pjb.3 for ; Tue, 26 Oct 2021 14:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9F+EWbh01K9eqvh7QO6VrhctGso+L9ps7sX+i8thX2Y=; b=Zdc4ztOZkl8MtmXXDulYtc8GEdI8IyMPqz3rieEXFQnL2Lqi1V7RuMN7H7cBLLh/WM /MIdKBeNWbepPud2CCiph86WRpuM3I7XKcdT+TO34XWvl8qHH7qYkb7bMs3S+fds2i43 aGu4iuDM+PHXHHNwIcrFMr7ZDDW4/ailCSjR8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9F+EWbh01K9eqvh7QO6VrhctGso+L9ps7sX+i8thX2Y=; b=S9WOy+HFBGz5Q/+Gc47wQt0vGd4iepNalypsww9wqib+vCo32JKC2t66xOph6Nlgkh 7fPxoDJz9qGnNlTdWFO+KxD8hRlJBLT64YXhOrGca+KEf9Rfo9+14qHLt7wZjzA6Un4Q RzTlxZcRxhHhIMXexUXljg59wj0bW5WBCl/vt6AlgRMPMU2Twm3ffWcAE6Qy1NdJdKvS CQNTGnKoLt6M5mYr986SK1RXZk1PFwAwe4oNSaoBLllp3QW1XrvWEPktb56lTkgW8Etg 380bZG1CLSDjKYHkfbwcFqSL/qsuzhPiQ+Roj3gx350VDCeE2itav/E2XakK9vjNjk/o auxw== X-Gm-Message-State: AOAM532eQxuDB3dTT0b2rGEgFo3Z7mxIfcwDVanwQzlwBZPpO7VqpGHW fEQS5GeK39lFoKR2I1qhVqgbAaExO6ro9A== X-Received: by 2002:a17:90b:198b:: with SMTP id mv11mr1503430pjb.235.1635285415549; Tue, 26 Oct 2021 14:56:55 -0700 (PDT) Received: from philipchen.mtv.corp.google.com ([2620:15c:202:201:dad:6684:6674:b268]) by smtp.gmail.com with ESMTPSA id t8sm21225953pgk.66.2021.10.26.14.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 14:56:55 -0700 (PDT) From: Philip Chen To: LKML Cc: swboyd@chromium.org, dianders@chromium.org, Philip Chen , Andrzej Hajda , Daniel Vetter , David Airlie , Jernej Skrabec , Jonas Karlman , Laurent Pinchart , Neil Armstrong , Robert Foss , dri-devel@lists.freedesktop.org Subject: [PATCH v4 2/2] drm/bridge: parade-ps8640: Populate devices on aux-bus Date: Tue, 26 Oct 2021 14:56:49 -0700 Message-Id: <20211026145622.v4.2.I09899dea340f11feab97d719cb4b62bef3179e4b@changeid> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211026145622.v4.1.I9d81c3b44f350707b5373d00524af77c4aae862b@changeid> References: <20211026145622.v4.1.I9d81c3b44f350707b5373d00524af77c4aae862b@changeid> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Conventionally, panel is listed under the root of the device tree. When userland asks for display mode, ps8640 bridge is responsible for returning EDID when ps8640_bridge_get_edid() is called. Now enable a new option of listing panel under "aux-bus" of ps8640 bridge node in the device tree. In this case, panel driver can retrieve EDID by triggering AUX transactions, without ps8640_bridge_get_edid() calls at all. To prevent the "old" and "new" options from interfering with each other's logic flow, disable DRM_BRIDGE_OP_EDID when the new option is taken. Signed-off-by: Philip Chen Reviewed-by: Stephen Boyd --- (no changes since v3) Changes in v3: - Fix when to call of_node_put() in ps8640_of_panel_on_aux_bus() Changes in v2: - Add of_node_put() calls in ps8640_of_panel_on_aux_bus() - Select DRM_DP_AUX_BUS for PS8640 driver in Kconfig - Replace _put_sync() with _put_sync_suspend() in ps8640_post_disable() drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/parade-ps8640.c | 51 ++++++++++++++++++++------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 431b6e12a81f..61db5a66b493 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -182,6 +182,7 @@ config DRM_PARADE_PS8622 config DRM_PARADE_PS8640 tristate "Parade PS8640 MIPI DSI to eDP Converter" depends on OF + select DRM_DP_AUX_BUS select DRM_KMS_HELPER select DRM_MIPI_DSI select DRM_PANEL diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c index cf1f630a3958..e737f1a27f30 100644 --- a/drivers/gpu/drm/bridge/parade-ps8640.c +++ b/drivers/gpu/drm/bridge/parade-ps8640.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -149,6 +150,23 @@ static inline struct ps8640 *aux_to_ps8640(struct drm_dp_aux *aux) return container_of(aux, struct ps8640, aux); } +static bool ps8640_of_panel_on_aux_bus(struct device *dev) +{ + struct device_node *bus, *panel; + + bus = of_get_child_by_name(dev->of_node, "aux-bus"); + if (!bus) + return false; + + panel = of_get_child_by_name(bus, "panel"); + of_node_put(bus); + if (!panel) + return false; + of_node_put(panel); + + return true; +} + static int ps8640_ensure_hpd(struct ps8640 *ps_bridge) { struct regmap *map = ps_bridge->regmap[PAGE2_TOP_CNTL]; @@ -556,17 +574,6 @@ static int ps8640_probe(struct i2c_client *client) if (!ps_bridge) return -ENOMEM; - /* port@1 is ps8640 output port */ - ret = drm_of_find_panel_or_bridge(np, 1, 0, &panel, NULL); - if (ret < 0) - return ret; - if (!panel) - return -ENODEV; - - ps_bridge->panel_bridge = devm_drm_panel_bridge_add(dev, panel); - if (IS_ERR(ps_bridge->panel_bridge)) - return PTR_ERR(ps_bridge->panel_bridge); - ps_bridge->supplies[0].supply = "vdd33"; ps_bridge->supplies[1].supply = "vdd12"; ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ps_bridge->supplies), @@ -589,9 +596,16 @@ static int ps8640_probe(struct i2c_client *client) ps_bridge->bridge.funcs = &ps8640_bridge_funcs; ps_bridge->bridge.of_node = dev->of_node; - ps_bridge->bridge.ops = DRM_BRIDGE_OP_EDID; ps_bridge->bridge.type = DRM_MODE_CONNECTOR_eDP; + /* + * In the device tree, if panel is listed under aux-bus of the bridge + * node, panel driver should be able to retrieve EDID by itself using + * aux-bus. So let's not set DRM_BRIDGE_OP_EDID here. + */ + if (!ps8640_of_panel_on_aux_bus(&client->dev)) + ps_bridge->bridge.ops = DRM_BRIDGE_OP_EDID; + ps_bridge->page[PAGE0_DP_CNTL] = client; ps_bridge->regmap[PAGE0_DP_CNTL] = devm_regmap_init_i2c(client, ps8640_regmap_config); @@ -630,6 +644,19 @@ static int ps8640_probe(struct i2c_client *client) if (ret) return ret; + devm_of_dp_aux_populate_ep_devices(&ps_bridge->aux); + + /* port@1 is ps8640 output port */ + ret = drm_of_find_panel_or_bridge(np, 1, 0, &panel, NULL); + if (ret < 0) + return ret; + if (!panel) + return -ENODEV; + + ps_bridge->panel_bridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(ps_bridge->panel_bridge)) + return PTR_ERR(ps_bridge->panel_bridge); + drm_bridge_add(&ps_bridge->bridge); return 0; -- 2.33.0.1079.g6e70778dc9-goog