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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97AFAC4338F for ; Sun, 25 Jul 2021 04:06: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 5C6EB608FE for ; Sun, 25 Jul 2021 04:06:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C6EB608FE 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 CE456737F3; Sun, 25 Jul 2021 04:06:11 +0000 (UTC) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25A02737F3 for ; Sun, 25 Jul 2021 04:06:10 +0000 (UTC) Received: by mail-ot1-x336.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so6509022oti.0 for ; Sat, 24 Jul 2021 21:06:10 -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=BQy51dmcCPfskpFReMMd+iY0APHtV+mJ8PmnMSgL0Sc=; b=VjkzUfEZF33VWY3hAWXdwvjVkalQ4+qGnr5LB41s+9NpLxRjpgZEpGhjxmDN+gVcBc KaVhdLR4t+jmd2hyXALG9UpGzkTWuPByPoLCV2WU/JJH93OMX9vzKu9oXshXSgLXxtuU nfahrK1XqDJecyJU56OBzeOWfpIbjPgHVTVWORYkftcIYnwTXW4++Xxgi1UtETrHH93F h5VWcg5xBCaCfmc+Y6VGcBBM4QIDssA7saZluEzK3xVFrAn8Kab6XuX0X02kO0Mg0bFo p9n6qtAZgDf7JFqfqQTu+ASoVxM3mLC/AS1KkvqdqkEVPkES1Np5Jw6xA5fy7C2tBJPp dDeA== 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=BQy51dmcCPfskpFReMMd+iY0APHtV+mJ8PmnMSgL0Sc=; b=grPWFIZ+sVQwc7NWFurGjUdPO4iX4qFbp5ZpIfBVW3+eFCJxOd+3z4OSZRN6mschb1 Su6l+yYyg9RBooZNih6QEc9/g1XBadOocAOmeZR4UHvPNBkENwPRzKR8mofrrqE3JMzl DK5GHTN6viRg6f9qSBcBs0rZG6Z00YCtClmGzPmsJzGrpotgjozrWSoGuba/owQqNhOl wbCW0gBS8xOfAXX4bku1vlgHIJT05a/ImZ+O5EUCbrYI60sZD2RJg3H2rUX/dmuc+kdh gGPVDqxHwDVTdDBrs3OR9aaYV3Q/X60GO+0x8Wjn+UhNr8Ctd1QBaouwZvY4MHZ9zBM2 9LwA== X-Gm-Message-State: AOAM533y5fj6GrpT41ZCYd/IAdnlx6QtntwEF5aXy3thWgk9Zdyc1sc8 hhiDl7wI+X9NPQlKjzL30GZnoA== X-Google-Smtp-Source: ABdhPJyMs5iTUOBhdlyTJ60z6OLpQf+glf2PtWFLOCqVIzCMRaFxAhsYaxyQEtCEbZoWH7N+lUH1fQ== X-Received: by 2002:a05:6830:19c2:: with SMTP id p2mr8072669otp.49.1627185969411; Sat, 24 Jul 2021 21:06:09 -0700 (PDT) Received: from yoga (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id g66sm6360391oob.27.2021.07.24.21.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Jul 2021 21:06:09 -0700 (PDT) Date: Sat, 24 Jul 2021 23:06:06 -0500 From: Bjorn Andersson To: Dmitry Baryshkov Subject: Re: [PATCH v4 3/7] drm/msm/dpu: support setting up two independent DSI connectors Message-ID: References: <20210717124016.316020-1-dmitry.baryshkov@linaro.org> <20210717124016.316020-4-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210717124016.316020-4-dmitry.baryshkov@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: , Cc: freedreno@lists.freedesktop.org, Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, Abhinav Kumar , David Airlie , dri-devel@lists.freedesktop.org, Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat 17 Jul 07:40 CDT 2021, Dmitry Baryshkov wrote: > Move setting up encoders from set_encoder_mode to > _dpu_kms_initialize_dsi() / _dpu_kms_initialize_displayport(). This > allows us to support not only "single DSI" and "bonded DSI" but also "two > independent DSI" configurations. In future this would also help adding > support for multiple DP connectors. > > Signed-off-by: Dmitry Baryshkov > Reviewed-by: Abhinav Kumar Reviewed-by: Bjorn Andersson Regards, Bjorn > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 102 +++++++++++++----------- > 1 file changed, 57 insertions(+), 45 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index 1d3a4f395e74..3cd2011e18d4 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -471,30 +471,68 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, > struct dpu_kms *dpu_kms) > { > struct drm_encoder *encoder = NULL; > + struct msm_display_info info; > int i, rc = 0; > > if (!(priv->dsi[0] || priv->dsi[1])) > return rc; > > - /*TODO: Support two independent DSI connectors */ > - encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI); > - if (IS_ERR(encoder)) { > - DPU_ERROR("encoder init failed for dsi display\n"); > - return PTR_ERR(encoder); > - } > - > - priv->encoders[priv->num_encoders++] = encoder; > - > + /* > + * We support following confiurations: > + * - Single DSI host (dsi0 or dsi1) > + * - Two independent DSI hosts > + * - Bonded DSI0 and DSI1 hosts > + * > + * TODO: Support swapping DSI0 and DSI1 in the bonded setup. > + */ > for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { > + int other = (i + 1) % 2; > + > if (!priv->dsi[i]) > continue; > > + if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && > + !msm_dsi_is_master_dsi(priv->dsi[i])) > + continue; > + > + encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI); > + if (IS_ERR(encoder)) { > + DPU_ERROR("encoder init failed for dsi display\n"); > + return PTR_ERR(encoder); > + } > + > + priv->encoders[priv->num_encoders++] = encoder; > + > + memset(&info, 0, sizeof(info)); > + info.intf_type = encoder->encoder_type; > + > rc = msm_dsi_modeset_init(priv->dsi[i], dev, encoder); > if (rc) { > DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n", > i, rc); > break; > } > + > + info.h_tile_instance[info.num_of_h_tiles++] = i; > + info.capabilities = msm_dsi_is_cmd_mode(priv->dsi[i]) ? > + MSM_DISPLAY_CAP_CMD_MODE : > + MSM_DISPLAY_CAP_VID_MODE; > + > + if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && priv->dsi[other]) { > + rc = msm_dsi_modeset_init(priv->dsi[other], dev, encoder); > + if (rc) { > + DPU_ERROR("modeset_init failed for dsi[%d], rc = %d\n", > + other, rc); > + break; > + } > + > + info.h_tile_instance[info.num_of_h_tiles++] = other; > + } > + > + rc = dpu_encoder_setup(dev, encoder, &info); > + if (rc) > + DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", > + encoder->base.id, rc); > } > > return rc; > @@ -505,6 +543,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, > struct dpu_kms *dpu_kms) > { > struct drm_encoder *encoder = NULL; > + struct msm_display_info info; > int rc = 0; > > if (!priv->dp) > @@ -516,6 +555,7 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, > return PTR_ERR(encoder); > } > > + memset(&info, 0, sizeof(info)); > rc = msm_dp_modeset_init(priv->dp, dev, encoder); > if (rc) { > DPU_ERROR("modeset_init failed for DP, rc = %d\n", rc); > @@ -524,6 +564,14 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, > } > > priv->encoders[priv->num_encoders++] = encoder; > + > + info.num_of_h_tiles = 1; > + info.capabilities = MSM_DISPLAY_CAP_VID_MODE; > + info.intf_type = encoder->encoder_type; > + rc = dpu_encoder_setup(dev, encoder, &info); > + if (rc) > + DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", > + encoder->base.id, rc); > return rc; > } > > @@ -726,41 +774,6 @@ static void dpu_kms_destroy(struct msm_kms *kms) > msm_kms_destroy(&dpu_kms->base); > } > > -static void _dpu_kms_set_encoder_mode(struct msm_kms *kms, > - struct drm_encoder *encoder, > - bool cmd_mode) > -{ > - struct msm_display_info info; > - struct msm_drm_private *priv = encoder->dev->dev_private; > - int i, rc = 0; > - > - memset(&info, 0, sizeof(info)); > - > - info.intf_type = encoder->encoder_type; > - info.capabilities = cmd_mode ? MSM_DISPLAY_CAP_CMD_MODE : > - MSM_DISPLAY_CAP_VID_MODE; > - > - switch (info.intf_type) { > - case DRM_MODE_ENCODER_DSI: > - /* TODO: No support for DSI swap */ > - for (i = 0; i < ARRAY_SIZE(priv->dsi); i++) { > - if (priv->dsi[i]) { > - info.h_tile_instance[info.num_of_h_tiles] = i; > - info.num_of_h_tiles++; > - } > - } > - break; > - case DRM_MODE_ENCODER_TMDS: > - info.num_of_h_tiles = 1; > - break; > - } > - > - rc = dpu_encoder_setup(encoder->dev, encoder, &info); > - if (rc) > - DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", > - encoder->base.id, rc); > -} > - > static irqreturn_t dpu_irq(struct msm_kms *kms) > { > struct dpu_kms *dpu_kms = to_dpu_kms(kms); > @@ -863,7 +876,6 @@ static const struct msm_kms_funcs kms_funcs = { > .get_format = dpu_get_msm_format, > .round_pixclk = dpu_kms_round_pixclk, > .destroy = dpu_kms_destroy, > - .set_encoder_mode = _dpu_kms_set_encoder_mode, > .snapshot = dpu_kms_mdp_snapshot, > #ifdef CONFIG_DEBUG_FS > .debugfs_init = dpu_kms_debugfs_init, > -- > 2.30.2 >