From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Stephen Boyd <swboyd@chromium.org>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Bjorn Andersson <andersson@kernel.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org,
Konrad Dybcio <konrad.dybcio@linaro.org>
Subject: [PATCH v3 02/38] drm/msm/dpu: constify DSC data structures
Date: Fri, 31 Mar 2023 00:52:48 +0300 [thread overview]
Message-ID: <20230330215324.1853304-3-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20230330215324.1853304-1-dmitry.baryshkov@linaro.org>
DSC hw catalog data is not supposed to be changed, so mark it as const
data.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 ++--
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
index e44e7455a56e..be9b9f8f143b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -1837,14 +1837,14 @@ static const struct dpu_merge_3d_cfg sm8550_merge_3d[] = {
.features = _features, \
}
-static struct dpu_dsc_cfg sdm845_dsc[] = {
+static const struct dpu_dsc_cfg sdm845_dsc[] = {
DSC_BLK("dsc_0", DSC_0, 0x80000, 0),
DSC_BLK("dsc_1", DSC_1, 0x80400, 0),
DSC_BLK("dsc_2", DSC_2, 0x80800, 0),
DSC_BLK("dsc_3", DSC_3, 0x80c00, 0),
};
-static struct dpu_dsc_cfg sm8150_dsc[] = {
+static const struct dpu_dsc_cfg sm8150_dsc[] = {
DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)),
DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)),
DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)),
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index 2f532543848c..fe360fb7c77b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -872,7 +872,7 @@ struct dpu_mdss_cfg {
const struct dpu_merge_3d_cfg *merge_3d;
u32 dsc_count;
- struct dpu_dsc_cfg *dsc;
+ const struct dpu_dsc_cfg *dsc;
u32 intf_count;
const struct dpu_intf_cfg *intf;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
index 619926da1441..4e1396575e6a 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c
@@ -175,7 +175,7 @@ static void dpu_hw_dsc_bind_pingpong_blk(
DPU_REG_WRITE(c, dsc_ctl_offset, mux_cfg);
}
-static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,
+static const struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,
const struct dpu_mdss_cfg *m,
void __iomem *addr,
struct dpu_hw_blk_reg_map *b)
@@ -207,7 +207,7 @@ struct dpu_hw_dsc *dpu_hw_dsc_init(enum dpu_dsc idx, void __iomem *addr,
const struct dpu_mdss_cfg *m)
{
struct dpu_hw_dsc *c;
- struct dpu_dsc_cfg *cfg;
+ const struct dpu_dsc_cfg *cfg;
c = kzalloc(sizeof(*c), GFP_KERNEL);
if (!c)
--
2.39.2
next prev parent reply other threads:[~2023-03-30 21:53 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 21:52 [PATCH v3 00/38] drm/msm/dpu: rework HW catalog Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 01/38] drm/msm/dpu: Allow variable SSPP/INTF_BLK size Dmitry Baryshkov
2023-04-01 0:57 ` Abhinav Kumar
2023-04-01 9:37 ` Dmitry Baryshkov
2023-04-03 22:04 ` [Freedreno] " Abhinav Kumar
2023-03-30 21:52 ` Dmitry Baryshkov [this message]
2023-04-01 1:01 ` [Freedreno] [PATCH v3 02/38] drm/msm/dpu: constify DSC data structures Abhinav Kumar
2023-03-30 21:52 ` [PATCH v3 03/38] drm/msm/dpu: mark remaining pp data as const Dmitry Baryshkov
2023-04-01 1:03 ` Abhinav Kumar
2023-03-30 21:52 ` [PATCH v3 04/38] drm/msm/dpu: move UBWC/memory configuration to separate struct Dmitry Baryshkov
2023-04-01 1:10 ` Abhinav Kumar
2023-03-30 21:52 ` [PATCH v3 05/38] drm/msm/dpu: split SM8550 catalog entry to the separate file Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 06/38] drm/msm/dpu: split SM8450 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 07/38] drm/msm/dpu: split SC8280XP " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 08/38] drm/msm/dpu: split SC7280 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 09/38] drm/msm/dpu: split SM8350 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 10/38] drm/msm/dpu: split SM6115 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 11/38] drm/msm/dpu: split QCM2290 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 12/38] drm/msm/dpu: split SC7180 " Dmitry Baryshkov
2023-03-30 21:52 ` [PATCH v3 13/38] drm/msm/dpu: split SM8250 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 14/38] drm/msm/dpu: split SC8180X " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 15/38] drm/msm/dpu: split SM8150 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 16/38] drm/msm/dpu: split MSM8998 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 17/38] drm/msm/dpu: split SDM845 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 18/38] drm/msm/dpu: duplicate sdm845 catalog entries Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 19/38] drm/msm/dpu: duplicate sc7180 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 20/38] drm/msm/dpu: duplicate sm8150 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 21/38] drm/msm/dpu: duplicate sm8250 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 22/38] drm/msm/dpu: duplicate sm8350 " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 23/38] drm/msm/dpu: use defined symbol for sc8280xp's maxwidth Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 24/38] drm/msm/dpu: catalog: add comments regarding DPU_CTL_SPLIT_DISPLAY Dmitry Baryshkov
2023-03-30 22:39 ` [v3,24/38] " Konrad Dybcio
2023-03-30 21:53 ` [PATCH v3 25/38] drm/msm/dpu: enable DPU_CTL_SPLIT_DISPLAY for sc8280xp Dmitry Baryshkov
2023-03-30 22:40 ` [v3,25/38] " Konrad Dybcio
2023-03-30 21:53 ` [PATCH v3 26/38] drm/msm/dpu: enable DSPP_2/3 for LM_2/3 on sm8450 Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 27/38] drm/msm/dpu: drop duplicate vig_sblk instances Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 28/38] drm/msm/dpu: enable DSPP on sc8180x Dmitry Baryshkov
2023-03-30 22:40 ` [v3,28/38] " Konrad Dybcio
2023-03-30 21:53 ` [PATCH v3 29/38] drm/msm/dpu: deduplicate sc8180x with sm8150 Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 30/38] drm/msm/dpu: deduplicate sm6115 with qcm2290 Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 31/38] drm/msm/dpu: deduplicate sc8280xp with sm8450 Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 32/38] drm/msm/dpu: drop unused macros from hw catalog Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 33/38] drm/msm/dpu: inline IRQ_n_MASK defines Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 34/38] drm/msm/dpu: rename INTF_foo_MASK to contain major DPU version Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 35/38] drm/msm/dpu: rename CTL_foo_MASK " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 36/38] drm/msm/dpu: rename VIG and DMA_foo_MASK " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 37/38] drm/msm/dpu: rename MIXER_foo_MASK " Dmitry Baryshkov
2023-03-30 21:53 ` [PATCH v3 38/38] drm/msm/dpu: rename MERGE_3D_foo_MASK " Dmitry Baryshkov
2023-04-03 18:06 ` [PATCH v3 00/38] drm/msm/dpu: rework HW catalog Abhinav Kumar
2023-04-03 18:48 ` Dmitry Baryshkov
2023-04-03 19:07 ` Abhinav Kumar
2023-04-03 22:16 ` Dmitry Baryshkov
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=20230330215324.1853304-3-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=quic_abhinavk@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