From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC5E2C4320E for ; Wed, 25 Aug 2021 23:28: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 6FF9A60E73 for ; Wed, 25 Aug 2021 23:28:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6FF9A60E73 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7492B6E43F; Wed, 25 Aug 2021 23:28:41 +0000 (UTC) Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CF406E43B for ; Wed, 25 Aug 2021 23:28:40 +0000 (UTC) Received: by mail-oi1-x231.google.com with SMTP id h133so1741677oib.7 for ; Wed, 25 Aug 2021 16:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fb57+7PyfP47yH5wT1DY5fSf8sXx5sPLlldolea85mg=; b=Dbr6q+54t7tRlQixbRvsB//aYQikUgbCdg0u6066BOvuHDoB+TevAAbcZ/ZjNq+ItR VwzKvEarqroeUXMZaNWUaETe8oWoZvmEvveDNAYjfrlTjLB2HtkCG3FDkl/W39M6C3b5 xGEWBy3AKUYLwgOBuVoiTVPB0+eBql04U/ETLmSrWdBy52Q3SY6/7n0UljZCv8tzCF8y ljYcORbdcg4ZImsNwvoAPrxVy2UOjt5o068vIPgIMuY9HIWVXiprxMFhysIVCDTOftIK rA5dCbEGX/dWUomD/6mVuISygHk6LIz3IuMFg20Zl/W+ywiCwEswZIjV1oo6UHGre6dY HFCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fb57+7PyfP47yH5wT1DY5fSf8sXx5sPLlldolea85mg=; b=jazksV2Eumjo+3smARzsBNdH+udIi+jt7W8qeXBvMTV/r+Eq0e73o02DJ9F5q5bnSu c/ofrVL3BTAk3M+fDkJh91RaI4LxPrfS0Dxlb2CXp2xrgaOTohI3Raub/2ogRJDvkqwN IWHa1+1JnZ1/kurYLl6ZGsTRCj9M3hwPz1e031c1/T/yKP6E3MQ5WO7mv+1bUFL3XfvX U+TcwM4ZbFPPjwoJhLywQ3ysn5XsDloHH/6Dt1ej0si7iN0gmm2GAZI2cR+aIlzz5FLg aOysvCXY7rAKaR8dcTzxyan12/M/N9SoW+m3oTaJOsgJ+bT35LoMYEzaYF9lQkpiMnMr znuA== X-Gm-Message-State: AOAM5339YY08saqeV5ktX4t0SteliG6Am9XSsGicKDyj6KS6MVJQkFcO Id0RnUr1dJyoIgKLt2modXOcTw== X-Google-Smtp-Source: ABdhPJxBGz1Q5a1J5n6yKIj0kIvh0gvLL4haMQ9fLpPGk+quv0yykLiQ2SuY0wn+VzLEwZy3N5JjFg== X-Received: by 2002:aca:ab93:: with SMTP id u141mr347516oie.151.1629934119758; Wed, 25 Aug 2021 16:28:39 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id bg9sm312101oib.26.2021.08.25.16.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 16:28:39 -0700 (PDT) Date: Wed, 25 Aug 2021 18:28:37 -0500 From: Bjorn Andersson To: Dmitry Baryshkov Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Kuogee Hsieh , Abhinav Kumar , Stephen Boyd , Chandan Uddaraju , Vara Reddy , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [RFC] drm/msm/dp: Allow attaching a drm_panel Message-ID: References: <20210726231351.655302-1-bjorn.andersson@linaro.org> <3bb5dc26-6779-6cb4-b9dd-e64c306e9ae6@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3bb5dc26-6779-6cb4-b9dd-e64c306e9ae6@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu 29 Jul 04:59 CDT 2021, Dmitry Baryshkov wrote: > On 27/07/2021 02:13, Bjorn Andersson wrote: > > eDP panels might need some power sequencing and backlight management, > > so make it possible to associate a drm_panel with a DP instance and > > prepare and enable the panel accordingly. > > > > Signed-off-by: Bjorn Andersson > > The idea looks good from my point of view. Thanks. > For v1 could you please extend it with the `if (panel)` checks and > handling of the error codes. Passing NULL to the drm_panel_* api is valid and a nop, and I run the same code for both eDP and DP. Would you still like it to indicate to a future reader that this might be NULL? Regards, Bjorn > > > --- > > > > This solves my immediate problem on my 8cx laptops, of indirectly controlling > > the backlight during DPMS. But my panel is powered when I boot it and as such I > > get the hpd interrupt and I don't actually have to deal with a power on > > sequence - so I'm posting this as an RFC, hoping to get some input on these > > other aspects. > > > > If this is acceptable I'd be happy to write up an accompanying DT binding > > change that marks port 2 of the DP controller's of_graph as a reference to the > > attached panel. > > > > drivers/gpu/drm/msm/dp/dp_display.c | 15 +++++++++++++-- > > drivers/gpu/drm/msm/dp/dp_display.h | 1 + > > drivers/gpu/drm/msm/dp/dp_parser.c | 19 +++++++++++++++++++ > > drivers/gpu/drm/msm/dp/dp_parser.h | 1 + > > 4 files changed, 34 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > > index 206bf7806f51..1db5a3f752d2 100644 > > --- a/drivers/gpu/drm/msm/dp/dp_display.c > > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > > @@ -10,6 +10,7 @@ > > #include > > #include > > #include > > +#include > > #include "msm_drv.h" > > #include "msm_kms.h" > > @@ -252,6 +253,8 @@ static int dp_display_bind(struct device *dev, struct device *master, > > goto end; > > } > > + dp->dp_display.drm_panel = dp->parser->drm_panel; > > + > > rc = dp_aux_register(dp->aux, drm); > > if (rc) { > > DRM_ERROR("DRM DP AUX register failed\n"); > > @@ -867,8 +870,10 @@ static int dp_display_set_mode(struct msm_dp *dp_display, > > return 0; > > } > > -static int dp_display_prepare(struct msm_dp *dp) > > +static int dp_display_prepare(struct msm_dp *dp_display) > > { > > + drm_panel_prepare(dp_display->drm_panel); > > + > > return 0; > > } > > @@ -886,6 +891,8 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data) > > if (!rc) > > dp_display->power_on = true; > > + drm_panel_enable(dp_display->drm_panel); > > + > > return rc; > > } > > @@ -915,6 +922,8 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) > > if (!dp_display->power_on) > > return 0; > > + drm_panel_disable(dp_display->drm_panel); > > + > > /* wait only if audio was enabled */ > > if (dp_display->audio_enabled) { > > /* signal the disconnect event */ > > @@ -939,8 +948,10 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) > > return 0; > > } > > -static int dp_display_unprepare(struct msm_dp *dp) > > +static int dp_display_unprepare(struct msm_dp *dp_display) > > { > > + drm_panel_unprepare(dp_display->drm_panel); > > + > > return 0; > > } > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h > > index 8b47cdabb67e..ce337824c95d 100644 > > --- a/drivers/gpu/drm/msm/dp/dp_display.h > > +++ b/drivers/gpu/drm/msm/dp/dp_display.h > > @@ -15,6 +15,7 @@ struct msm_dp { > > struct device *codec_dev; > > struct drm_connector *connector; > > struct drm_encoder *encoder; > > + struct drm_panel *drm_panel; > > bool is_connected; > > bool audio_enabled; > > bool power_on; > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > > index fc8a6452f641..e6a6e9007bfd 100644 > > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > > @@ -6,6 +6,7 @@ > > #include > > #include > > +#include > > #include > > #include "dp_parser.h" > > @@ -276,6 +277,20 @@ static int dp_parser_clock(struct dp_parser *parser) > > return 0; > > } > > +static int dp_parser_find_panel(struct dp_parser *parser) > > +{ > > + struct device_node *np = parser->pdev->dev.of_node; > > + int rc; > > + > > + rc = drm_of_find_panel_or_bridge(np, 2, 0, &parser->drm_panel, NULL); > > + if (rc == -ENODEV) > > + rc = 0; > > + else if (rc) > > + DRM_ERROR("failed to acquire DRM panel: %d\n", rc); > > + > > + return rc; > > +} > > + > > static int dp_parser_parse(struct dp_parser *parser) > > { > > int rc = 0; > > @@ -297,6 +312,10 @@ static int dp_parser_parse(struct dp_parser *parser) > > if (rc) > > return rc; > > + rc = dp_parser_find_panel(parser); > > + if (rc) > > + return rc; > > + > > /* Map the corresponding regulator information according to > > * version. Currently, since we only have one supported platform, > > * mapping the regulator directly. > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.h b/drivers/gpu/drm/msm/dp/dp_parser.h > > index 3266b529c090..994ca9336acd 100644 > > --- a/drivers/gpu/drm/msm/dp/dp_parser.h > > +++ b/drivers/gpu/drm/msm/dp/dp_parser.h > > @@ -122,6 +122,7 @@ struct dp_parser { > > struct dp_display_data disp_data; > > const struct dp_regulator_cfg *regulator_cfg; > > u32 max_dp_lanes; > > + struct drm_panel *drm_panel; > > int (*parse)(struct dp_parser *parser); > > }; > > > > > -- > With best wishes > Dmitry