From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Konrad Dybcio <konrad.dybcio@linaro.org>,
linux-arm-msm@vger.kernel.org, andersson@kernel.org,
agross@kernel.org, krzysztof.kozlowski@linaro.org
Cc: marijn.suijten@somainline.org, Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>,
Douglas Anderson <dianders@chromium.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Loic Poulain <loic.poulain@linaro.org>,
AngeloGioacchino Del Regno <kholk11@gmail.com>,
Archit Taneja <architt@codeaurora.org>,
Harigovindan P <harigovi@codeaurora.org>,
Rajeev Nandan <quic_rajeevny@quicinc.com>,
Stephen Boyd <swboyd@chromium.org>,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 05/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs
Date: Sat, 11 Feb 2023 17:52:17 +0200 [thread overview]
Message-ID: <fc29d13c-28bf-5090-bfaa-52ec6b3860e1@linaro.org> (raw)
In-Reply-To: <20230211115110.1462920-6-konrad.dybcio@linaro.org>
On 11/02/2023 13:51, Konrad Dybcio wrote:
> Some structs were defined multiple times for no apparent reason.
> Deduplicate them.
>
> Fixes: 3f3c8aff1f8f ("drm/msm/dsi: Add configuration for 8x76")
> Fixes: 3a3ff88a0fc1 ("drm/msm/dsi: Add 8x96 info in dsi_cfg")
> Fixes: 6125bd327e16 ("drm/msm: add DSI support for sc7180")
> Fixes: 65c391b31994 ("drm/msm/dsi: Add DSI support for SC7280")
I think we should drop these Fixes headers. There are no issues to be
fixed in those versions. The code was inefficient and resulted in
duplication of data, but that's all.
Other than that:
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
> drivers/gpu/drm/msm/dsi/dsi_cfg.c | 77 +++++++++++--------------------
> 1 file changed, 26 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> index 5f62c563bd1c..860681bfc084 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
> @@ -47,41 +47,32 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = {
> },
> };
>
> -static const char * const dsi_8916_bus_clk_names[] = {
> +static const char * const dsi_v1_3_1_clk_names[] = {
> "mdp_core", "iface", "bus",
> };
>
> -static const struct regulator_bulk_data msm8916_dsi_regulators[] = {
> +static const struct regulator_bulk_data dsi_v1_3_1_regulators[] = {
> { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */
> { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */
> };
>
> static const struct msm_dsi_config msm8916_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> - .regulator_data = msm8916_dsi_regulators,
> - .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators),
> - .bus_clk_names = dsi_8916_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names),
> + .regulator_data = dsi_v1_3_1_regulators,
> + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators),
> + .bus_clk_names = dsi_v1_3_1_clk_names,
> + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names),
> .io_start = {
> { 0x1a98000, 0 },
> },
> };
>
> -static const char * const dsi_8976_bus_clk_names[] = {
> - "mdp_core", "iface", "bus",
> -};
> -
> -static const struct regulator_bulk_data msm8976_dsi_regulators[] = {
> - { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */
> - { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */
> -};
> -
> static const struct msm_dsi_config msm8976_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> - .regulator_data = msm8976_dsi_regulators,
> - .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators),
> - .bus_clk_names = dsi_8976_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names),
> + .regulator_data = dsi_v1_3_1_regulators,
> + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators),
> + .bus_clk_names = dsi_v1_3_1_clk_names,
> + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names),
> .io_start = {
> { 0x1a94000, 0x1a96000, 0 },
> },
> @@ -107,10 +98,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg = {
> },
> };
>
> -static const char * const dsi_8996_bus_clk_names[] = {
> - "mdp_core", "iface", "bus", "core_mmss",
> -};
> -
> static const struct regulator_bulk_data msm8996_dsi_regulators[] = {
> { .supply = "vdda", .init_load_uA = 18160 }, /* 1.25 V */
> { .supply = "vcca", .init_load_uA = 17000 }, /* 0.925 V */
> @@ -121,8 +108,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> .regulator_data = msm8996_dsi_regulators,
> .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators),
> - .bus_clk_names = dsi_8996_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names),
> + .bus_clk_names = dsi_6g_bus_clk_names,
> + .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names),
> .io_start = {
> { 0x994000, 0x996000, 0 },
> },
> @@ -167,24 +154,20 @@ static const struct msm_dsi_config sdm660_dsi_cfg = {
> },
> };
>
> -static const char * const dsi_sdm845_bus_clk_names[] = {
> +static const char * const dsi_v2_4_clk_names[] = {
> "iface", "bus",
> };
>
> -static const char * const dsi_sc7180_bus_clk_names[] = {
> - "iface", "bus",
> -};
> -
> -static const struct regulator_bulk_data sdm845_dsi_regulators[] = {
> +static const struct regulator_bulk_data dsi_v2_4_regulators[] = {
> { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */
> };
>
> static const struct msm_dsi_config sdm845_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> - .regulator_data = sdm845_dsi_regulators,
> - .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators),
> - .bus_clk_names = dsi_sdm845_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names),
> + .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 = {
> { 0xae94000, 0xae96000, 0 },
> },
> @@ -198,32 +181,24 @@ static const struct msm_dsi_config sm8550_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> .regulator_data = sm8550_dsi_regulators,
> .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators),
> - .bus_clk_names = dsi_sdm845_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names),
> + .bus_clk_names = dsi_v2_4_clk_names,
> + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> .io_start = {
> { 0xae94000, 0xae96000, 0 },
> },
> };
>
> -static const struct regulator_bulk_data sc7180_dsi_regulators[] = {
> - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */
> -};
> -
> static const struct msm_dsi_config sc7180_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> - .regulator_data = sc7180_dsi_regulators,
> - .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators),
> - .bus_clk_names = dsi_sc7180_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names),
> + .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 = {
> { 0xae94000, 0 },
> },
> };
>
> -static const char * const dsi_sc7280_bus_clk_names[] = {
> - "iface", "bus",
> -};
> -
> static const struct regulator_bulk_data sc7280_dsi_regulators[] = {
> { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */
> };
> @@ -232,8 +207,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = {
> .io_offset = DSI_6G_REG_SHIFT,
> .regulator_data = sc7280_dsi_regulators,
> .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators),
> - .bus_clk_names = dsi_sc7280_bus_clk_names,
> - .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names),
> + .bus_clk_names = dsi_v2_4_clk_names,
> + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names),
> .io_start = {
> { 0xae94000, 0xae96000, 0 },
> },
--
With best wishes
Dmitry
next prev parent reply other threads:[~2023-02-11 15:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-11 11:51 [PATCH 00/10] Fix DSI host idx detection on HW revision clash Konrad Dybcio
2023-02-11 11:51 ` [PATCH 01/10] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible Konrad Dybcio
2023-02-11 11:51 ` [PATCH 02/10] drm/msm/dsi: Turn msm_dsi_config::io_start into a 2d array Konrad Dybcio
2023-02-11 13:17 ` Dmitry Baryshkov
2023-02-13 9:16 ` Konrad Dybcio
2023-02-11 11:51 ` [PATCH 03/10] drm/msm/dsi: Zero-terminate msm_dsi_config::io_start Konrad Dybcio
2023-02-11 13:19 ` Dmitry Baryshkov
2023-02-13 9:18 ` Konrad Dybcio
2023-02-13 11:41 ` Dmitry Baryshkov
2023-02-11 11:51 ` [PATCH 04/10] drm/msm/dsi: dsi_host: Fix DSI index detection when version clash occurs Konrad Dybcio
2023-02-11 13:26 ` Dmitry Baryshkov
2023-02-13 9:19 ` Konrad Dybcio
2023-02-11 11:51 ` [PATCH 05/10] drm/msm/dsi: dsi_cfg: Deduplicate identical structs Konrad Dybcio
2023-02-11 15:52 ` Dmitry Baryshkov [this message]
2023-02-13 9:20 ` Konrad Dybcio
2023-02-11 11:51 ` [PATCH 06/10] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Konrad Dybcio
2023-02-11 15:52 ` Dmitry Baryshkov
2023-02-13 9:20 ` Konrad Dybcio
2023-02-11 11:51 ` [PATCH 07/10] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection Konrad Dybcio
2023-02-11 11:51 ` [PATCH 08/10] drm/msm/dsi: Remove custom DSI config handling Konrad Dybcio
2023-02-11 15:53 ` Dmitry Baryshkov
2023-02-11 11:51 ` [PATCH 09/10] dt-bindings: display/msm: dsi-controller-main: Add SM6115 Konrad Dybcio
2023-02-11 11:51 ` [PATCH 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=fc29d13c-28bf-5090-bfaa-52ec6b3860e1@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=architt@codeaurora.org \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=harigovi@codeaurora.org \
--cc=kholk11@gmail.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=marijn.suijten@somainline.org \
--cc=neil.armstrong@linaro.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_rajeevny@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=swboyd@chromium.org \
/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