| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230313235550.zo243m5qn23yadey@SoMainline.org>
Date: Tue, 14 Mar 2023 00:55:50 +0100
From: Marijn Suijten <marijn.suijten@...ainline.org>
To: Konrad Dybcio <konrad.dybcio@...aro.org>
Cc: Rob Clark <robdclark@...il.com>,
Abhinav Kumar <quic_abhinavk@...cinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
Sean Paul <sean@...rly.run>, David Airlie <airlied@...il.com>,
Daniel Vetter <daniel@...ll.ch>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Krishna Manikandan <quic_mkrishn@...cinc.com>,
Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Rob Herring <robh@...nel.org>, linux-arm-msm@...r.kernel.org,
dri-devel@...ts.freedesktop.org, freedreno@...ts.freedesktop.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 04/10] drm/msm/dsi: dsi_cfg: Deduplicate identical
structs
On 2023-03-07 14:01:42, Konrad Dybcio wrote:
> Some structs were defined multiple times for no apparent reason.
> Deduplicate them.
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@...aro.org>
Seems a bit inconsistent to name some of these with their DSI host
revision, and keep some named after the SoC. Also in the name of
msm_dsi_config. Regardless:
Reviewed-by: Marijn Suijten <marijn.suijten@...ainline.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 6c192963c100..d39521850018 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 },
> },
> };
>
> -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 },
> },
> @@ -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 },
> },
> @@ -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 },
> },
> @@ -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 },
> },
> };
>
> -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 },
> },
> };
>
> -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 },
> },
>
> --
> 2.39.2
>
Powered by blists - more mailing lists