From: Marijn Suijten <marijn.suijten@somainline.org>
To: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Krishna Manikandan <quic_mkrishn@quicinc.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Rob Herring <robh@kernel.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 06/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection
Date: Tue, 14 Mar 2023 15:05:49 +0100 [thread overview]
Message-ID: <20230314140549.5fk4wroviqvknvfn@SoMainline.org> (raw)
In-Reply-To: <20230314130439.nbarj2wsdf6ishmo@SoMainline.org>
On 2023-03-14 14:04:41, Marijn Suijten wrote:
> On 2023-03-14 13:13:44, Konrad Dybcio wrote:
> > Now that the logic can handle multiple sets of registers, move
> > the QCM2290 to the common logic and mark it deprecated. This allows us
> > to remove a couple of structs, saving some memory.
> >
> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> > ---
> > drivers/gpu/drm/msm/dsi/dsi.c | 5 +++--
> > drivers/gpu/drm/msm/dsi/dsi_cfg.c | 20 ++------------------
> > 2 files changed, 5 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c
> > index 31fdee2052be..f761973e4cba 100644
> > --- a/drivers/gpu/drm/msm/dsi/dsi.c
> > +++ b/drivers/gpu/drm/msm/dsi/dsi.c
> > @@ -4,7 +4,6 @@
> > */
> >
> > #include "dsi.h"
> > -#include "dsi_cfg.h"
> >
> > bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi)
> > {
> > @@ -174,7 +173,9 @@ static int dsi_dev_remove(struct platform_device *pdev)
> >
> > static const struct of_device_id dt_match[] = {
> > { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ },
> > - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = &qcm2290_dsi_cfg_handler },
> > +
> > + /* Deprecated, don't use */
> > + { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL },
> > {}
> > };
> >
> > diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > index 03d98cbcc978..29ccd755cc2e 100644
> > --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> > @@ -169,7 +169,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = {
> > .bus_clk_names = dsi_v2_4_clk_names,
> > .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> > .io_start = {
> > - { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */
> > + { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 */
> > + { 0x5e94000 }, /* QCM2290 / SM6115 / SM6125 / SM6375 */
> > },
> > };
> >
> > @@ -203,17 +204,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg = {
> > },
> > };
> >
> > -static const struct msm_dsi_config qcm2290_dsi_cfg = {
> > - .io_offset = DSI_6G_REG_SHIFT,
> > - .regulator_data = dsi_v2_4_regulators,
> > - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators),
> > - .bus_clk_names = dsi_v2_4_clk_names,
> > - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> > - .io_start = {
> > - { 0x5e94000 },
> > - },
> > -};
> > -
> > static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = {
> > .link_clk_set_rate = dsi_link_clk_set_rate_v2,
> > .link_clk_enable = dsi_link_clk_enable_v2,
> > @@ -304,9 +294,3 @@ const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor)
> >
> > return cfg_hnd;
> > }
> > -
> > -/* Non autodetect configs */
> > -const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler = {
> > - .cfg = &qcm2290_dsi_cfg,
> > - .ops = &msm_dsi_6g_v2_host_ops,
> > -};
>
> Should be removed from dsi_cfg.h, but you did that in patch 7 instead.
As discussed in patch 7 this could possibly be fixed up when Dmitry
applies the series, rather than going through yet another resend... So
have my r-b already just in case:
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
next prev parent reply other threads:[~2023-03-14 14:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 12:13 [PATCH v4 00/10] Fix DSI host idx detection on HW revision clash Konrad Dybcio
2023-03-14 12:13 ` [PATCH v4 01/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible Konrad Dybcio
2023-03-14 14:10 ` Rob Herring
2023-03-14 12:13 ` [PATCH v4 02/10] drm/msm/dsi: Get rid of msm_dsi_config::num_dsi Konrad Dybcio
2023-03-14 12:13 ` [PATCH v4 03/10] drm/msm/dsi: Fix DSI index detection when version clash occurs Konrad Dybcio
2023-03-14 12:13 ` [PATCH v4 04/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs Konrad Dybcio
2023-03-14 12:13 ` [PATCH v4 05/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Konrad Dybcio
2023-03-14 12:13 ` [PATCH v4 06/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection Konrad Dybcio
2023-03-14 13:04 ` Marijn Suijten
2023-03-14 14:05 ` Marijn Suijten [this message]
2023-03-14 12:13 ` [PATCH v4 07/10] drm/msm/dsi: Remove custom DSI config handling Konrad Dybcio
2023-03-14 13:05 ` Marijn Suijten
2023-03-14 13:44 ` Konrad Dybcio
2023-03-14 14:04 ` Marijn Suijten
2023-03-14 12:13 ` [PATCH v4 08/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated compatible Konrad Dybcio
2023-03-16 6:50 ` Krzysztof Kozlowski
2023-03-14 12:13 ` [PATCH v4 09/10] dt-bindings: display/msm: dsi-controller-main: Add SM6115 Konrad Dybcio
2023-03-14 13:13 ` Marijn Suijten
2023-03-14 12:13 ` [PATCH v4 10/10] arm64: dts: qcom: sm6115: Use the correct DSI compatible Konrad Dybcio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230314140549.5fk4wroviqvknvfn@SoMainline.org \
--to=marijn.suijten@somainline.org \
--cc=agross@kernel.org \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_mkrishn@quicinc.com \
--cc=robdclark@gmail.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®