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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DECBC433EF for ; Wed, 6 Oct 2021 00:43:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F34E261207 for ; Wed, 6 Oct 2021 00:43:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237096AbhJFApD (ORCPT ); Tue, 5 Oct 2021 20:45:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237062AbhJFApC (ORCPT ); Tue, 5 Oct 2021 20:45:02 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7A1C06174E for ; Tue, 5 Oct 2021 17:43:11 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id w190so1690816oif.5 for ; Tue, 05 Oct 2021 17:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=wKt6Nae01mSLjqjYH36TB6q2xyVedx1Ybson8Q1DwNo=; b=iFAJ9/IgDbQ7Sy4xqhyBxFt3v9D8bevCQfBgMV5P6XDy12y+C8h/tYzAwW05HvLVoq GKGeSuk+uuQYFr/xhhCWujoSKaXnwZ6F0I3iIo3xYZyyhO5TtALLjhLHeoq7cZU88mD+ b+wsFarnUhcTgAiki9DVDpNtzwpTkktWrQwPc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=wKt6Nae01mSLjqjYH36TB6q2xyVedx1Ybson8Q1DwNo=; b=uUunV2naQOp3glyAQFoBd9M21/UJxLExcFO444QAQaE3c2CMv/WqMrWMqt2/AKV1hQ 884f47NcfqrpFr7jU8jRPK5kHcuRw3x0h8AxFhj8+E8XZUfyVrGelw0LLvJfpXBCObAP aQdYdekX1BmOf86k6LN7TcuOT9xpUYdzTyPKoN8kwcQ26w3BHFXV5o1UcWx9Oxu8FrMH mTGSeaAc8wvzonNDrl2+XyBqI4GcXna5ANJtqHr6D4GHEZ1Mfx7rSGHnFGgkp9gqigwX s9CJOaxBCkUQFAJ3nmJAmP4ZF/tJWrmzcGCLOenAgMPxTq9S5xXgiCM4GewO1L05zlGX AQoQ== X-Gm-Message-State: AOAM532oXH6tXlngdyVJcEdsaoWb8ZOH73EsrfRVDw6ZGs4ArkQA23tN FoMiatwSL0FhrvQabHvwU5uXJy0TlzOOBMwndUpDuA== X-Google-Smtp-Source: ABdhPJya2fZABu/CNUYa983sa9i2c4DPhWV3wKcrOj61v8RSJ6oV5qsUFBtRizZg3Lv11yJZ04jeeHU1MRPlii5J3mY= X-Received: by 2002:aca:42d7:: with SMTP id p206mr5038548oia.32.1633480990745; Tue, 05 Oct 2021 17:43:10 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 5 Oct 2021 17:43:10 -0700 MIME-Version: 1.0 In-Reply-To: <20211005231323.2663520-6-bjorn.andersson@linaro.org> References: <20211005231323.2663520-1-bjorn.andersson@linaro.org> <20211005231323.2663520-6-bjorn.andersson@linaro.org> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Tue, 5 Oct 2021 17:43:10 -0700 Message-ID: Subject: Re: [PATCH v4 5/7] drm/msm/dp: Support up to 3 DP controllers To: Abhinav Kumar , Bjorn Andersson , Daniel Vetter , David Airlie , Dmitry Baryshkov , Kalyan Thota , Kuogee Hsieh , Rob Clark , Sean Paul Cc: Rob Herring , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Quoting Bjorn Andersson (2021-10-05 16:13:21) > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index bdaf227f05dc..674cddfee5b0 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -79,6 +79,8 @@ struct dp_display_private { > char *name; > int irq; > > + unsigned int id; > + > /* state variables */ > bool core_initialized; > bool hpd_irq_on; > @@ -229,7 +231,7 @@ static int dp_display_bind(struct device *dev, struct device *master, > > dp->dp_display.drm_dev = drm; > priv = drm->dev_private; > - priv->dp = &(dp->dp_display); > + priv->dp[dp->id] = &(dp->dp_display); Can we drop the extra parenthesis? > > rc = dp->parser->parse(dp->parser, dp->dp_display.connector_type); > if (rc) { > @@ -269,7 +271,7 @@ static void dp_display_unbind(struct device *dev, struct device *master, > > dp_power_client_deinit(dp->power); > dp_aux_unregister(dp->aux); > - priv->dp = NULL; > + priv->dp[dp->id] = NULL; > } > > static const struct component_ops dp_display_comp_ops = { > @@ -1233,7 +1239,7 @@ static int dp_display_probe(struct platform_device *pdev) > if (!dp) > return -ENOMEM; > > - desc = dp_display_get_desc(pdev); > + desc = dp_display_get_desc(pdev, &dp->id); I'm sad that dp->id has to match the number in the SoC specific dpu_intf_cfg array in drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c still. Is there any way we can avoid that? Also, notice how those arrays already have INTF_DP macros, which makes me think that it may be better to connect this to those arrays instead of making an msm_dp_desc structure and then make sure the 'type' member matches a connector type number. Otherwise this code is super fragile. > if (!desc) > return -EINVAL; >