* [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling @ 2021-05-15 19:09 Dmitry Baryshkov 2021-05-15 19:09 ` [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features Dmitry Baryshkov ` (4 more replies) 0 siblings, 5 replies; 10+ messages in thread From: Dmitry Baryshkov @ 2021-05-15 19:09 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno Drop most of "extra" features of dpu_hw_blk. Changes since v2: - Include a patch to fix compilation issue with merge3d id handling Changes since v1: - Make dpu_hw_blk an empty structure - Split this into separate patchset ---------------------------------------------------------------- Dmitry Baryshkov (4): drm/msm/dpu: remove unused dpu_hw_blk features drm/msm/dpu: drop dpu_hw_blk_destroy function drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure drivers/gpu/drm/msm/Makefile | 1 - .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 11 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 139 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 22 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 7 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 4 +- 14 files changed, 10 insertions(+), 220 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov @ 2021-05-15 19:09 ` Dmitry Baryshkov 2021-06-04 21:08 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function Dmitry Baryshkov ` (3 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2021-05-15 19:09 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno Remove all unused dpu_hw_blk features and functions: - dpu_hw_blk_get()/_put() and respective refcounting, - global list of all dpu_hw_blk instances, - dpu_hw_blk_ops and empty implementation inside each hw_blk subdriver. This leaves dpu_hw_blk as a placeholder with just type and index. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 104 +----------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 19 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 4 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 4 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 4 +- 10 files changed, 10 insertions(+), 145 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c index 819b26e660b9..abad043f35f5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c @@ -11,33 +11,16 @@ #include "dpu_hw_mdss.h" #include "dpu_hw_blk.h" -/* Serialization lock for dpu_hw_blk_list */ -static DEFINE_MUTEX(dpu_hw_blk_lock); - -/* List of all hw block objects */ -static LIST_HEAD(dpu_hw_blk_list); - /** * dpu_hw_blk_init - initialize hw block object * @hw_blk: pointer to hw block object * @type: hw block type - enum dpu_hw_blk_type * @id: instance id of the hw block - * @ops: Pointer to block operations */ -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id, - struct dpu_hw_blk_ops *ops) +void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id) { - INIT_LIST_HEAD(&hw_blk->list); hw_blk->type = type; hw_blk->id = id; - atomic_set(&hw_blk->refcount, 0); - - if (ops) - hw_blk->ops = *ops; - - mutex_lock(&dpu_hw_blk_lock); - list_add(&hw_blk->list, &dpu_hw_blk_list); - mutex_unlock(&dpu_hw_blk_lock); } /** @@ -51,89 +34,4 @@ void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk) pr_err("invalid parameters\n"); return; } - - if (atomic_read(&hw_blk->refcount)) - pr_err("hw_blk:%d.%d invalid refcount\n", hw_blk->type, - hw_blk->id); - - mutex_lock(&dpu_hw_blk_lock); - list_del(&hw_blk->list); - mutex_unlock(&dpu_hw_blk_lock); -} - -/** - * dpu_hw_blk_get - get hw_blk from free pool - * @hw_blk: if specified, increment reference count only - * @type: if hw_blk is not specified, allocate the next available of this type - * @id: if specified (>= 0), allocate the given instance of the above type - * return: pointer to hw block object - */ -struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, int id) -{ - struct dpu_hw_blk *curr; - int rc, refcount; - - if (!hw_blk) { - mutex_lock(&dpu_hw_blk_lock); - list_for_each_entry(curr, &dpu_hw_blk_list, list) { - if ((curr->type != type) || - (id >= 0 && curr->id != id) || - (id < 0 && - atomic_read(&curr->refcount))) - continue; - - hw_blk = curr; - break; - } - mutex_unlock(&dpu_hw_blk_lock); - } - - if (!hw_blk) { - pr_debug("no hw_blk:%d\n", type); - return NULL; - } - - refcount = atomic_inc_return(&hw_blk->refcount); - - if (refcount == 1 && hw_blk->ops.start) { - rc = hw_blk->ops.start(hw_blk); - if (rc) { - pr_err("failed to start hw_blk:%d rc:%d\n", type, rc); - goto error_start; - } - } - - pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type, - hw_blk->id, refcount); - return hw_blk; - -error_start: - dpu_hw_blk_put(hw_blk); - return ERR_PTR(rc); -} - -/** - * dpu_hw_blk_put - put hw_blk to free pool if decremented refcount is zero - * @hw_blk: hw block to be freed - */ -void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk) -{ - if (!hw_blk) { - pr_err("invalid parameters\n"); - return; - } - - pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type, hw_blk->id, - atomic_read(&hw_blk->refcount)); - - if (!atomic_read(&hw_blk->refcount)) { - pr_err("hw_blk:%d.%d invalid put\n", hw_blk->type, hw_blk->id); - return; - } - - if (atomic_dec_return(&hw_blk->refcount)) - return; - - if (hw_blk->ops.stop) - hw_blk->ops.stop(hw_blk); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h index 2bf737f8dd1b..fb3be9a36a50 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h @@ -7,19 +7,9 @@ #include <linux/types.h> #include <linux/list.h> -#include <linux/atomic.h> struct dpu_hw_blk; -/** - * struct dpu_hw_blk_ops - common hardware block operations - * @start: start operation on first get - * @stop: stop operation on last put - */ -struct dpu_hw_blk_ops { - int (*start)(struct dpu_hw_blk *); - void (*stop)(struct dpu_hw_blk *); -}; /** * struct dpu_hw_blk - definition of hardware block object @@ -29,17 +19,10 @@ struct dpu_hw_blk_ops { * @refcount: reference/usage count */ struct dpu_hw_blk { - struct list_head list; u32 type; int id; - atomic_t refcount; - struct dpu_hw_blk_ops ops; }; -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id, - struct dpu_hw_blk_ops *ops); +void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk); - -struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, int id); -void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk); #endif /*_DPU_HW_BLK_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 2d4645e01ebf..04a2c4b9a357 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -589,8 +589,6 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active; }; -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -615,7 +613,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, c->mixer_count = m->mixer_count; c->mixer_hw_caps = m->mixer; - dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c index e42f901a7de5..d2f1045a736a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c @@ -85,8 +85,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp, return ERR_PTR(-EINVAL); } -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -112,7 +110,7 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, c->cap = cfg; _setup_dspp_ops(c, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c index 1599e3f49a4f..6ffe97601716 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -299,8 +299,6 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops *ops, ops->bind_pingpong_blk = dpu_hw_intf_bind_pingpong_blk; } -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -327,7 +325,7 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, c->mdss = m; _setup_intf_ops(&c->ops, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c index 6ac0b5a0e057..554bb881de3a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -160,8 +160,6 @@ static void _setup_mixer_ops(const struct dpu_mdss_cfg *m, ops->setup_border_color = dpu_hw_lm_setup_border_color; } -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -184,7 +182,7 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, c->cap = cfg; _setup_mixer_ops(m, &c->ops, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c index 720813e5a8ae..863229dd0140 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c @@ -58,8 +58,6 @@ static void _setup_merge_3d_ops(struct dpu_hw_merge_3d *c, c->ops.setup_3d_mode = dpu_hw_merge_3d_setup_3d_mode; }; -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum dpu_merge_3d idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -81,7 +79,7 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum dpu_merge_3d idx, c->caps = cfg; _setup_merge_3d_ops(c, c->caps->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c index 245a7a62b5c6..334d5b28f533 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -261,8 +261,6 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c, c->ops.setup_dither = dpu_hw_pp_setup_dither; }; -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum dpu_pingpong idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -284,7 +282,7 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum dpu_pingpong idx, c->caps = cfg; _setup_pingpong_ops(c, c->caps->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx, &dpu_hw_ops); + dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx); return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index 34d81aa16041..ceb2488ea270 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -706,8 +706,6 @@ static const struct dpu_sspp_cfg *_sspp_offset(enum dpu_sspp sspp, return ERR_PTR(-ENOMEM); } -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, void __iomem *addr, struct dpu_mdss_cfg *catalog, bool is_virtual_pipe) @@ -735,7 +733,7 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, hw_pipe->cap = cfg; _setup_layer_ops(hw_pipe, hw_pipe->cap->features); - dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx, &dpu_hw_ops); + dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx); return hw_pipe; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c index 01b76766a9a8..5d2c33ec1de7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -295,8 +295,6 @@ static const struct dpu_mdp_cfg *_top_offset(enum dpu_mdp mdp, return ERR_PTR(-EINVAL); } -static struct dpu_hw_blk_ops dpu_hw_ops; - struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp idx, void __iomem *addr, const struct dpu_mdss_cfg *m) @@ -324,7 +322,7 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp idx, mdp->caps = cfg; _setup_mdp_ops(&mdp->ops, mdp->caps->features); - dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx, &dpu_hw_ops); + dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx); return mdp; } -- 2.30.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Freedreno] [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features 2021-05-15 19:09 ` [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features Dmitry Baryshkov @ 2021-06-04 21:08 ` abhinavk 0 siblings, 0 replies; 10+ messages in thread From: abhinavk @ 2021-06-04 21:08 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Rob Clark, Sean Paul, Jonathan Marek, Stephen Boyd, linux-arm-msm, dri-devel, David Airlie, Daniel Vetter, freedreno On 2021-05-15 12:09, Dmitry Baryshkov wrote: > Remove all unused dpu_hw_blk features and functions: > - dpu_hw_blk_get()/_put() and respective refcounting, > - global list of all dpu_hw_blk instances, > - dpu_hw_blk_ops and empty implementation inside each hw_blk subdriver. > > This leaves dpu_hw_blk as a placeholder with just type and index. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 104 +----------------- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 19 +--- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 4 +- > .../gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 4 +- > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 4 +- > 10 files changed, 10 insertions(+), 145 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > index 819b26e660b9..abad043f35f5 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > @@ -11,33 +11,16 @@ > #include "dpu_hw_mdss.h" > #include "dpu_hw_blk.h" > > -/* Serialization lock for dpu_hw_blk_list */ > -static DEFINE_MUTEX(dpu_hw_blk_lock); > - > -/* List of all hw block objects */ > -static LIST_HEAD(dpu_hw_blk_list); > - > /** > * dpu_hw_blk_init - initialize hw block object > * @hw_blk: pointer to hw block object > * @type: hw block type - enum dpu_hw_blk_type > * @id: instance id of the hw block > - * @ops: Pointer to block operations > */ > -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id, > - struct dpu_hw_blk_ops *ops) > +void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id) > { > - INIT_LIST_HEAD(&hw_blk->list); > hw_blk->type = type; > hw_blk->id = id; > - atomic_set(&hw_blk->refcount, 0); > - > - if (ops) > - hw_blk->ops = *ops; > - > - mutex_lock(&dpu_hw_blk_lock); > - list_add(&hw_blk->list, &dpu_hw_blk_list); > - mutex_unlock(&dpu_hw_blk_lock); > } > > /** > @@ -51,89 +34,4 @@ void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk) > pr_err("invalid parameters\n"); > return; > } > - > - if (atomic_read(&hw_blk->refcount)) > - pr_err("hw_blk:%d.%d invalid refcount\n", hw_blk->type, > - hw_blk->id); > - > - mutex_lock(&dpu_hw_blk_lock); > - list_del(&hw_blk->list); > - mutex_unlock(&dpu_hw_blk_lock); > -} > - > -/** > - * dpu_hw_blk_get - get hw_blk from free pool > - * @hw_blk: if specified, increment reference count only > - * @type: if hw_blk is not specified, allocate the next available of > this type > - * @id: if specified (>= 0), allocate the given instance of the above > type > - * return: pointer to hw block object > - */ > -struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, > int id) > -{ > - struct dpu_hw_blk *curr; > - int rc, refcount; > - > - if (!hw_blk) { > - mutex_lock(&dpu_hw_blk_lock); > - list_for_each_entry(curr, &dpu_hw_blk_list, list) { > - if ((curr->type != type) || > - (id >= 0 && curr->id != id) || > - (id < 0 && > - atomic_read(&curr->refcount))) > - continue; > - > - hw_blk = curr; > - break; > - } > - mutex_unlock(&dpu_hw_blk_lock); > - } > - > - if (!hw_blk) { > - pr_debug("no hw_blk:%d\n", type); > - return NULL; > - } > - > - refcount = atomic_inc_return(&hw_blk->refcount); > - > - if (refcount == 1 && hw_blk->ops.start) { > - rc = hw_blk->ops.start(hw_blk); > - if (rc) { > - pr_err("failed to start hw_blk:%d rc:%d\n", type, rc); > - goto error_start; > - } > - } > - > - pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type, > - hw_blk->id, refcount); > - return hw_blk; > - > -error_start: > - dpu_hw_blk_put(hw_blk); > - return ERR_PTR(rc); > -} > - > -/** > - * dpu_hw_blk_put - put hw_blk to free pool if decremented refcount is > zero > - * @hw_blk: hw block to be freed > - */ > -void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk) > -{ > - if (!hw_blk) { > - pr_err("invalid parameters\n"); > - return; > - } > - > - pr_debug("hw_blk:%d.%d refcount:%d\n", hw_blk->type, hw_blk->id, > - atomic_read(&hw_blk->refcount)); > - > - if (!atomic_read(&hw_blk->refcount)) { > - pr_err("hw_blk:%d.%d invalid put\n", hw_blk->type, hw_blk->id); > - return; > - } > - > - if (atomic_dec_return(&hw_blk->refcount)) > - return; > - > - if (hw_blk->ops.stop) > - hw_blk->ops.stop(hw_blk); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > index 2bf737f8dd1b..fb3be9a36a50 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > @@ -7,19 +7,9 @@ > > #include <linux/types.h> > #include <linux/list.h> > -#include <linux/atomic.h> > > struct dpu_hw_blk; > > -/** > - * struct dpu_hw_blk_ops - common hardware block operations > - * @start: start operation on first get > - * @stop: stop operation on last put > - */ > -struct dpu_hw_blk_ops { > - int (*start)(struct dpu_hw_blk *); > - void (*stop)(struct dpu_hw_blk *); > -}; > > /** > * struct dpu_hw_blk - definition of hardware block object > @@ -29,17 +19,10 @@ struct dpu_hw_blk_ops { > * @refcount: reference/usage count > */ > struct dpu_hw_blk { > - struct list_head list; > u32 type; > int id; > - atomic_t refcount; > - struct dpu_hw_blk_ops ops; > }; > > -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id, > - struct dpu_hw_blk_ops *ops); > +void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); > void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk); > - > -struct dpu_hw_blk *dpu_hw_blk_get(struct dpu_hw_blk *hw_blk, u32 type, > int id); > -void dpu_hw_blk_put(struct dpu_hw_blk *hw_blk); > #endif /*_DPU_HW_BLK_H */ > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index 2d4645e01ebf..04a2c4b9a357 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -589,8 +589,6 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops > *ops, > ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active; > }; > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -615,7 +613,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl > idx, > c->mixer_count = m->mixer_count; > c->mixer_hw_caps = m->mixer; > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > index e42f901a7de5..d2f1045a736a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > @@ -85,8 +85,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum > dpu_dspp dspp, > return ERR_PTR(-EINVAL); > } > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -112,7 +110,7 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp > idx, > c->cap = cfg; > _setup_dspp_ops(c, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > index 1599e3f49a4f..6ffe97601716 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > @@ -299,8 +299,6 @@ static void _setup_intf_ops(struct dpu_hw_intf_ops > *ops, > ops->bind_pingpong_blk = dpu_hw_intf_bind_pingpong_blk; > } > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -327,7 +325,7 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf > idx, > c->mdss = m; > _setup_intf_ops(&c->ops, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > index 6ac0b5a0e057..554bb881de3a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > @@ -160,8 +160,6 @@ static void _setup_mixer_ops(const struct > dpu_mdss_cfg *m, > ops->setup_border_color = dpu_hw_lm_setup_border_color; > } > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -184,7 +182,7 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm > idx, > c->cap = cfg; > _setup_mixer_ops(m, &c->ops, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > index 720813e5a8ae..863229dd0140 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > @@ -58,8 +58,6 @@ static void _setup_merge_3d_ops(struct > dpu_hw_merge_3d *c, > c->ops.setup_3d_mode = dpu_hw_merge_3d_setup_3d_mode; > }; > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum dpu_merge_3d idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -81,7 +79,7 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum > dpu_merge_3d idx, > c->caps = cfg; > _setup_merge_3d_ops(c, c->caps->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 245a7a62b5c6..334d5b28f533 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -261,8 +261,6 @@ static void _setup_pingpong_ops(struct > dpu_hw_pingpong *c, > c->ops.setup_dither = dpu_hw_pp_setup_dither; > }; > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum dpu_pingpong idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -284,7 +282,7 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum > dpu_pingpong idx, > c->caps = cfg; > _setup_pingpong_ops(c, c->caps->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx); > > return c; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > index 34d81aa16041..ceb2488ea270 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > @@ -706,8 +706,6 @@ static const struct dpu_sspp_cfg > *_sspp_offset(enum dpu_sspp sspp, > return ERR_PTR(-ENOMEM); > } > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, > void __iomem *addr, struct dpu_mdss_cfg *catalog, > bool is_virtual_pipe) > @@ -735,7 +733,7 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp > idx, > hw_pipe->cap = cfg; > _setup_layer_ops(hw_pipe, hw_pipe->cap->features); > > - dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx); > > return hw_pipe; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > index 01b76766a9a8..5d2c33ec1de7 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > @@ -295,8 +295,6 @@ static const struct dpu_mdp_cfg *_top_offset(enum > dpu_mdp mdp, > return ERR_PTR(-EINVAL); > } > > -static struct dpu_hw_blk_ops dpu_hw_ops; > - > struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp idx, > void __iomem *addr, > const struct dpu_mdss_cfg *m) > @@ -324,7 +322,7 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp > idx, > mdp->caps = cfg; > _setup_mdp_ops(&mdp->ops, mdp->caps->features); > > - dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx, &dpu_hw_ops); > + dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx); > > return mdp; > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov 2021-05-15 19:09 ` [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features Dmitry Baryshkov @ 2021-05-15 19:09 ` Dmitry Baryshkov 2021-06-04 21:08 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong Dmitry Baryshkov ` (2 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2021-05-15 19:09 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno The dpu_hw_blk_destroy() function is empty, so we can drop it now. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 13 ------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 -- 10 files changed, 31 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c index abad043f35f5..1f2b74b9eb65 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c @@ -22,16 +22,3 @@ void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id) hw_blk->type = type; hw_blk->id = id; } - -/** - * dpu_hw_blk_destroy - destroy hw block object. - * @hw_blk: pointer to hw block object - * return: none - */ -void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk) -{ - if (!hw_blk) { - pr_err("invalid parameters\n"); - return; - } -} diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h index fb3be9a36a50..7768694b558a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h @@ -24,5 +24,4 @@ struct dpu_hw_blk { }; void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); -void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk); #endif /*_DPU_HW_BLK_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 04a2c4b9a357..441f66a4fb37 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -620,7 +620,5 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, void dpu_hw_ctl_destroy(struct dpu_hw_ctl *ctx) { - if (ctx) - dpu_hw_blk_destroy(&ctx->base); kfree(ctx); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c index d2f1045a736a..977b25968f34 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c @@ -117,9 +117,6 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, void dpu_hw_dspp_destroy(struct dpu_hw_dspp *dspp) { - if (dspp) - dpu_hw_blk_destroy(&dspp->base); - kfree(dspp); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c index 6ffe97601716..17224556d5a8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -332,8 +332,6 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, void dpu_hw_intf_destroy(struct dpu_hw_intf *intf) { - if (intf) - dpu_hw_blk_destroy(&intf->base); kfree(intf); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c index 554bb881de3a..76f8b8f75b82 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -189,7 +189,5 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, void dpu_hw_lm_destroy(struct dpu_hw_mixer *lm) { - if (lm) - dpu_hw_blk_destroy(&lm->base); kfree(lm); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c index 863229dd0140..406ba950a066 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c @@ -86,7 +86,5 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum dpu_merge_3d idx, void dpu_hw_merge_3d_destroy(struct dpu_hw_merge_3d *hw) { - if (hw) - dpu_hw_blk_destroy(&hw->base); kfree(hw); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c index 334d5b28f533..92cd724263ce 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -289,7 +289,5 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum dpu_pingpong idx, void dpu_hw_pingpong_destroy(struct dpu_hw_pingpong *pp) { - if (pp) - dpu_hw_blk_destroy(&pp->base); kfree(pp); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index ceb2488ea270..8734a47040aa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -740,8 +740,6 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, void dpu_hw_sspp_destroy(struct dpu_hw_pipe *ctx) { - if (ctx) - dpu_hw_blk_destroy(&ctx->base); kfree(ctx); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c index 5d2c33ec1de7..dae77d9c2c74 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -329,8 +329,6 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp idx, void dpu_hw_mdp_destroy(struct dpu_hw_mdp *mdp) { - if (mdp) - dpu_hw_blk_destroy(&mdp->base); kfree(mdp); } -- 2.30.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Freedreno] [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function 2021-05-15 19:09 ` [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function Dmitry Baryshkov @ 2021-06-04 21:08 ` abhinavk 0 siblings, 0 replies; 10+ messages in thread From: abhinavk @ 2021-06-04 21:08 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Rob Clark, Sean Paul, Jonathan Marek, Stephen Boyd, linux-arm-msm, dri-devel, David Airlie, Daniel Vetter, freedreno On 2021-05-15 12:09, Dmitry Baryshkov wrote: > The dpu_hw_blk_destroy() function is empty, so we can drop it now. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 13 ------------- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 1 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 3 --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 -- > 10 files changed, 31 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > index abad043f35f5..1f2b74b9eb65 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > @@ -22,16 +22,3 @@ void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 > type, int id) > hw_blk->type = type; > hw_blk->id = id; > } > - > -/** > - * dpu_hw_blk_destroy - destroy hw block object. > - * @hw_blk: pointer to hw block object > - * return: none > - */ > -void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk) > -{ > - if (!hw_blk) { > - pr_err("invalid parameters\n"); > - return; > - } > -} > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > index fb3be9a36a50..7768694b558a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > @@ -24,5 +24,4 @@ struct dpu_hw_blk { > }; > > void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); > -void dpu_hw_blk_destroy(struct dpu_hw_blk *hw_blk); > #endif /*_DPU_HW_BLK_H */ > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index 04a2c4b9a357..441f66a4fb37 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -620,7 +620,5 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl > idx, > > void dpu_hw_ctl_destroy(struct dpu_hw_ctl *ctx) > { > - if (ctx) > - dpu_hw_blk_destroy(&ctx->base); > kfree(ctx); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > index d2f1045a736a..977b25968f34 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > @@ -117,9 +117,6 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp > idx, > > void dpu_hw_dspp_destroy(struct dpu_hw_dspp *dspp) > { > - if (dspp) > - dpu_hw_blk_destroy(&dspp->base); > - > kfree(dspp); > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > index 6ffe97601716..17224556d5a8 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > @@ -332,8 +332,6 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf > idx, > > void dpu_hw_intf_destroy(struct dpu_hw_intf *intf) > { > - if (intf) > - dpu_hw_blk_destroy(&intf->base); > kfree(intf); > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > index 554bb881de3a..76f8b8f75b82 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > @@ -189,7 +189,5 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm > idx, > > void dpu_hw_lm_destroy(struct dpu_hw_mixer *lm) > { > - if (lm) > - dpu_hw_blk_destroy(&lm->base); > kfree(lm); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > index 863229dd0140..406ba950a066 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > @@ -86,7 +86,5 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum > dpu_merge_3d idx, > > void dpu_hw_merge_3d_destroy(struct dpu_hw_merge_3d *hw) > { > - if (hw) > - dpu_hw_blk_destroy(&hw->base); > kfree(hw); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 334d5b28f533..92cd724263ce 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -289,7 +289,5 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum > dpu_pingpong idx, > > void dpu_hw_pingpong_destroy(struct dpu_hw_pingpong *pp) > { > - if (pp) > - dpu_hw_blk_destroy(&pp->base); > kfree(pp); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > index ceb2488ea270..8734a47040aa 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > @@ -740,8 +740,6 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp > idx, > > void dpu_hw_sspp_destroy(struct dpu_hw_pipe *ctx) > { > - if (ctx) > - dpu_hw_blk_destroy(&ctx->base); > kfree(ctx); > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > index 5d2c33ec1de7..dae77d9c2c74 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > @@ -329,8 +329,6 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp > idx, > > void dpu_hw_mdp_destroy(struct dpu_hw_mdp *mdp) > { > - if (mdp) > - dpu_hw_blk_destroy(&mdp->base); > kfree(mdp); > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov 2021-05-15 19:09 ` [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features Dmitry Baryshkov 2021-05-15 19:09 ` [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function Dmitry Baryshkov @ 2021-05-15 19:09 ` Dmitry Baryshkov 2021-06-04 21:09 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure Dmitry Baryshkov 2021-06-02 21:43 ` [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov 4 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2021-05-15 19:09 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno Use struct dpu_hw_merge_3d pointer in struct dpu_hw_pingpong rather than using struct dpu_hw_blk. This is the only user of dpu_hw_blk.id, which will be cleaned in the next patch. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 11 ++++------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 4 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c index 0e06b7e73c7a..4feec24162bc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c @@ -284,7 +284,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( intf_cfg.stream_sel = 0; /* Don't care value for video mode */ intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); if (phys_enc->hw_pp->merge_3d) - intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->id; + intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags); phys_enc->hw_intf->ops.setup_timing_gen(phys_enc->hw_intf, @@ -298,11 +298,8 @@ static void dpu_encoder_phys_vid_setup_timing_engine( true, phys_enc->hw_pp->idx); - if (phys_enc->hw_pp->merge_3d) { - struct dpu_hw_merge_3d *merge_3d = to_dpu_hw_merge_3d(phys_enc->hw_pp->merge_3d); - - merge_3d->ops.setup_3d_mode(merge_3d, intf_cfg.mode_3d); - } + if (phys_enc->hw_pp->merge_3d) + phys_enc->hw_pp->merge_3d->ops.setup_3d_mode(phys_enc->hw_pp->merge_3d, intf_cfg.mode_3d); spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags); @@ -461,7 +458,7 @@ static void dpu_encoder_phys_vid_enable(struct dpu_encoder_phys *phys_enc) ctl->ops.update_pending_flush_intf(ctl, phys_enc->hw_intf->idx); if (ctl->ops.update_pending_flush_merge_3d && phys_enc->hw_pp->merge_3d) - ctl->ops.update_pending_flush_merge_3d(ctl, phys_enc->hw_pp->merge_3d->id); + ctl->ops.update_pending_flush_merge_3d(ctl, phys_enc->hw_pp->merge_3d->idx); skip_flush: DPU_DEBUG_VIDENC(phys_enc, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h index 845b9ce80e31..89d08a715c16 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h @@ -126,6 +126,8 @@ struct dpu_hw_pingpong_ops { struct dpu_hw_dither_cfg *cfg); }; +struct dpu_hw_merge_3d; + struct dpu_hw_pingpong { struct dpu_hw_blk base; struct dpu_hw_blk_reg_map hw; @@ -133,7 +135,7 @@ struct dpu_hw_pingpong { /* pingpong */ enum dpu_pingpong idx; const struct dpu_pingpong_cfg *caps; - struct dpu_hw_blk *merge_3d; + struct dpu_hw_merge_3d *merge_3d; /* ops */ struct dpu_hw_pingpong_ops ops; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index fd2d104f0a91..c0eec12498e7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -162,7 +162,7 @@ int dpu_rm_init(struct dpu_rm *rm, goto fail; } if (pp->merge_3d && pp->merge_3d < MERGE_3D_MAX) - hw->merge_3d = rm->merge_3d_blks[pp->merge_3d - MERGE_3D_0]; + hw->merge_3d = to_dpu_hw_merge_3d(rm->merge_3d_blks[pp->merge_3d - MERGE_3D_0]); rm->pingpong_blks[pp->id - PINGPONG_0] = &hw->base; } -- 2.30.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Freedreno] [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong 2021-05-15 19:09 ` [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong Dmitry Baryshkov @ 2021-06-04 21:09 ` abhinavk 0 siblings, 0 replies; 10+ messages in thread From: abhinavk @ 2021-06-04 21:09 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Rob Clark, Sean Paul, Jonathan Marek, Stephen Boyd, linux-arm-msm, dri-devel, David Airlie, Daniel Vetter, freedreno On 2021-05-15 12:09, Dmitry Baryshkov wrote: > Use struct dpu_hw_merge_3d pointer in struct dpu_hw_pingpong rather > than using struct dpu_hw_blk. This is the only user of dpu_hw_blk.id, > which will be cleaned in the next patch. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 11 ++++------- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 4 +++- > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- > 3 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > index 0e06b7e73c7a..4feec24162bc 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > @@ -284,7 +284,7 @@ static void > dpu_encoder_phys_vid_setup_timing_engine( > intf_cfg.stream_sel = 0; /* Don't care value for video mode */ > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > if (phys_enc->hw_pp->merge_3d) > - intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->id; > + intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; > > spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags); > phys_enc->hw_intf->ops.setup_timing_gen(phys_enc->hw_intf, > @@ -298,11 +298,8 @@ static void > dpu_encoder_phys_vid_setup_timing_engine( > true, > phys_enc->hw_pp->idx); > > - if (phys_enc->hw_pp->merge_3d) { > - struct dpu_hw_merge_3d *merge_3d = > to_dpu_hw_merge_3d(phys_enc->hw_pp->merge_3d); > - > - merge_3d->ops.setup_3d_mode(merge_3d, intf_cfg.mode_3d); > - } > + if (phys_enc->hw_pp->merge_3d) > + phys_enc->hw_pp->merge_3d->ops.setup_3d_mode(phys_enc->hw_pp->merge_3d, > intf_cfg.mode_3d); > > spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags); > > @@ -461,7 +458,7 @@ static void dpu_encoder_phys_vid_enable(struct > dpu_encoder_phys *phys_enc) > > ctl->ops.update_pending_flush_intf(ctl, phys_enc->hw_intf->idx); > if (ctl->ops.update_pending_flush_merge_3d && > phys_enc->hw_pp->merge_3d) > - ctl->ops.update_pending_flush_merge_3d(ctl, > phys_enc->hw_pp->merge_3d->id); > + ctl->ops.update_pending_flush_merge_3d(ctl, > phys_enc->hw_pp->merge_3d->idx); > > skip_flush: > DPU_DEBUG_VIDENC(phys_enc, > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h > index 845b9ce80e31..89d08a715c16 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h > @@ -126,6 +126,8 @@ struct dpu_hw_pingpong_ops { > struct dpu_hw_dither_cfg *cfg); > }; > > +struct dpu_hw_merge_3d; > + > struct dpu_hw_pingpong { > struct dpu_hw_blk base; > struct dpu_hw_blk_reg_map hw; > @@ -133,7 +135,7 @@ struct dpu_hw_pingpong { > /* pingpong */ > enum dpu_pingpong idx; > const struct dpu_pingpong_cfg *caps; > - struct dpu_hw_blk *merge_3d; > + struct dpu_hw_merge_3d *merge_3d; > > /* ops */ > struct dpu_hw_pingpong_ops ops; > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > index fd2d104f0a91..c0eec12498e7 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > @@ -162,7 +162,7 @@ int dpu_rm_init(struct dpu_rm *rm, > goto fail; > } > if (pp->merge_3d && pp->merge_3d < MERGE_3D_MAX) > - hw->merge_3d = rm->merge_3d_blks[pp->merge_3d - MERGE_3D_0]; > + hw->merge_3d = to_dpu_hw_merge_3d(rm->merge_3d_blks[pp->merge_3d - > MERGE_3D_0]); > rm->pingpong_blks[pp->id - PINGPONG_0] = &hw->base; > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov ` (2 preceding siblings ...) 2021-05-15 19:09 ` [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong Dmitry Baryshkov @ 2021-05-15 19:09 ` Dmitry Baryshkov 2021-06-04 21:15 ` [Freedreno] " abhinavk 2021-06-02 21:43 ` [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov 4 siblings, 1 reply; 10+ messages in thread From: Dmitry Baryshkov @ 2021-05-15 19:09 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno The code does not really use dpu_hw_blk fields, so drop them, making dpu_hw_blk empty structure. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 24 ------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 4 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 -- .../gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 2 -- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 12 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 610d630326bb..55dbde30c2a2 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -58,7 +58,6 @@ msm-y := \ disp/dpu1/dpu_encoder_phys_cmd.o \ disp/dpu1/dpu_encoder_phys_vid.o \ disp/dpu1/dpu_formats.o \ - disp/dpu1/dpu_hw_blk.o \ disp/dpu1/dpu_hw_catalog.o \ disp/dpu1/dpu_hw_ctl.o \ disp/dpu1/dpu_hw_interrupts.o \ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c deleted file mode 100644 index 1f2b74b9eb65..000000000000 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. - */ - -#define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ - -#include <linux/mutex.h> -#include <linux/errno.h> -#include <linux/slab.h> - -#include "dpu_hw_mdss.h" -#include "dpu_hw_blk.h" - -/** - * dpu_hw_blk_init - initialize hw block object - * @hw_blk: pointer to hw block object - * @type: hw block type - enum dpu_hw_blk_type - * @id: instance id of the hw block - */ -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id) -{ - hw_blk->type = type; - hw_blk->id = id; -} diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h index 7768694b558a..52e92f37eda4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h @@ -19,9 +19,7 @@ struct dpu_hw_blk; * @refcount: reference/usage count */ struct dpu_hw_blk { - u32 type; - int id; + /* opaque */ }; -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); #endif /*_DPU_HW_BLK_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index 441f66a4fb37..f8a74f6cdc4c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -613,8 +613,6 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl idx, c->mixer_count = m->mixer_count; c->mixer_hw_caps = m->mixer; - dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c index 977b25968f34..a98e964c3b6f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c @@ -110,8 +110,6 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp idx, c->cap = cfg; _setup_dspp_ops(c, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c index 17224556d5a8..116e2b5b1a90 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -325,8 +325,6 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf idx, c->mdss = m; _setup_intf_ops(&c->ops, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c index 76f8b8f75b82..cb6bb7a22c15 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -182,8 +182,6 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm idx, c->cap = cfg; _setup_mixer_ops(m, &c->ops, c->cap->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c index 406ba950a066..c06d595d5df0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c @@ -79,8 +79,6 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum dpu_merge_3d idx, c->caps = cfg; _setup_merge_3d_ops(c, c->caps->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c index 92cd724263ce..55766c97c4c8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -282,8 +282,6 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum dpu_pingpong idx, c->caps = cfg; _setup_pingpong_ops(c, c->caps->features); - dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx); - return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index 8734a47040aa..69eed7932486 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -733,8 +733,6 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, hw_pipe->cap = cfg; _setup_layer_ops(hw_pipe, hw_pipe->cap->features); - dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx); - return hw_pipe; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c index dae77d9c2c74..282e3c6c6d48 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -322,8 +322,6 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp idx, mdp->caps = cfg; _setup_mdp_ops(&mdp->ops, mdp->caps->features); - dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx); - return mdp; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c index c0eec12498e7..f9c83d6e427a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -428,7 +428,7 @@ static int _dpu_rm_reserve_ctls( features = ctl->caps->features; has_split_display = BIT(DPU_CTL_SPLIT_DISPLAY) & features; - DPU_DEBUG("ctl %d caps 0x%lX\n", rm->ctl_blks[j]->id, features); + DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features); if (needs_split_display != has_split_display) continue; -- 2.30.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Freedreno] [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure 2021-05-15 19:09 ` [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure Dmitry Baryshkov @ 2021-06-04 21:15 ` abhinavk 0 siblings, 0 replies; 10+ messages in thread From: abhinavk @ 2021-06-04 21:15 UTC (permalink / raw) To: Dmitry Baryshkov Cc: Bjorn Andersson, Rob Clark, Sean Paul, Jonathan Marek, Stephen Boyd, linux-arm-msm, dri-devel, David Airlie, Daniel Vetter, freedreno On 2021-05-15 12:09, Dmitry Baryshkov wrote: > The code does not really use dpu_hw_blk fields, so drop them, making > dpu_hw_blk empty structure. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/Makefile | 1 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 24 ------------------- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 4 +--- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 -- > .../gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 2 -- > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- > 12 files changed, 2 insertions(+), 45 deletions(-) > delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > > diff --git a/drivers/gpu/drm/msm/Makefile > b/drivers/gpu/drm/msm/Makefile > index 610d630326bb..55dbde30c2a2 100644 > --- a/drivers/gpu/drm/msm/Makefile > +++ b/drivers/gpu/drm/msm/Makefile > @@ -58,7 +58,6 @@ msm-y := \ > disp/dpu1/dpu_encoder_phys_cmd.o \ > disp/dpu1/dpu_encoder_phys_vid.o \ > disp/dpu1/dpu_formats.o \ > - disp/dpu1/dpu_hw_blk.o \ > disp/dpu1/dpu_hw_catalog.o \ > disp/dpu1/dpu_hw_ctl.o \ > disp/dpu1/dpu_hw_interrupts.o \ > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > deleted file mode 100644 > index 1f2b74b9eb65..000000000000 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > +++ /dev/null > @@ -1,24 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-only > -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. > - */ > - > -#define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ > - > -#include <linux/mutex.h> > -#include <linux/errno.h> > -#include <linux/slab.h> > - > -#include "dpu_hw_mdss.h" > -#include "dpu_hw_blk.h" > - > -/** > - * dpu_hw_blk_init - initialize hw block object > - * @hw_blk: pointer to hw block object > - * @type: hw block type - enum dpu_hw_blk_type > - * @id: instance id of the hw block > - */ > -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id) > -{ > - hw_blk->type = type; > - hw_blk->id = id; > -} > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > index 7768694b558a..52e92f37eda4 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h > @@ -19,9 +19,7 @@ struct dpu_hw_blk; > * @refcount: reference/usage count > */ > struct dpu_hw_blk { > - u32 type; > - int id; > + /* opaque */ > }; > > -void dpu_hw_blk_init(struct dpu_hw_blk *hw_blk, u32 type, int id); > #endif /*_DPU_HW_BLK_H */ > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index 441f66a4fb37..f8a74f6cdc4c 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -613,8 +613,6 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(enum dpu_ctl > idx, > c->mixer_count = m->mixer_count; > c->mixer_hw_caps = m->mixer; > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_CTL, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > index 977b25968f34..a98e964c3b6f 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c > @@ -110,8 +110,6 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(enum dpu_dspp > idx, > c->cap = cfg; > _setup_dspp_ops(c, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_DSPP, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > index 17224556d5a8..116e2b5b1a90 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c > @@ -325,8 +325,6 @@ struct dpu_hw_intf *dpu_hw_intf_init(enum dpu_intf > idx, > c->mdss = m; > _setup_intf_ops(&c->ops, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_INTF, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > index 76f8b8f75b82..cb6bb7a22c15 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c > @@ -182,8 +182,6 @@ struct dpu_hw_mixer *dpu_hw_lm_init(enum dpu_lm > idx, > c->cap = cfg; > _setup_mixer_ops(m, &c->ops, c->cap->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_LM, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > index 406ba950a066..c06d595d5df0 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c > @@ -79,8 +79,6 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(enum > dpu_merge_3d idx, > c->caps = cfg; > _setup_merge_3d_ops(c, c->caps->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_MERGE_3D, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 92cd724263ce..55766c97c4c8 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -282,8 +282,6 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(enum > dpu_pingpong idx, > c->caps = cfg; > _setup_pingpong_ops(c, c->caps->features); > > - dpu_hw_blk_init(&c->base, DPU_HW_BLK_PINGPONG, idx); > - > return c; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > index 8734a47040aa..69eed7932486 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c > @@ -733,8 +733,6 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp > idx, > hw_pipe->cap = cfg; > _setup_layer_ops(hw_pipe, hw_pipe->cap->features); > > - dpu_hw_blk_init(&hw_pipe->base, DPU_HW_BLK_SSPP, idx); > - > return hw_pipe; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > index dae77d9c2c74..282e3c6c6d48 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c > @@ -322,8 +322,6 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(enum dpu_mdp > idx, > mdp->caps = cfg; > _setup_mdp_ops(&mdp->ops, mdp->caps->features); > > - dpu_hw_blk_init(&mdp->base, DPU_HW_BLK_TOP, idx); > - > return mdp; > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > index c0eec12498e7..f9c83d6e427a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c > @@ -428,7 +428,7 @@ static int _dpu_rm_reserve_ctls( > features = ctl->caps->features; > has_split_display = BIT(DPU_CTL_SPLIT_DISPLAY) & features; > > - DPU_DEBUG("ctl %d caps 0x%lX\n", rm->ctl_blks[j]->id, features); > + DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features); > > if (needs_split_display != has_split_display) > continue; ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov ` (3 preceding siblings ...) 2021-05-15 19:09 ` [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure Dmitry Baryshkov @ 2021-06-02 21:43 ` Dmitry Baryshkov 4 siblings, 0 replies; 10+ messages in thread From: Dmitry Baryshkov @ 2021-06-02 21:43 UTC (permalink / raw) To: Bjorn Andersson, Rob Clark, Sean Paul, Abhinav Kumar Cc: Jonathan Marek, Stephen Boyd, David Airlie, Daniel Vetter, linux-arm-msm, dri-devel, freedreno On 15/05/2021 22:09, Dmitry Baryshkov wrote: > Drop most of "extra" features of dpu_hw_blk. > > Changes since v2: > - Include a patch to fix compilation issue with merge3d id handling > > Changes since v1: > - Make dpu_hw_blk an empty structure > - Split this into separate patchset Gracious ping for this patchset. > ---------------------------------------------------------------- > Dmitry Baryshkov (4): > drm/msm/dpu: remove unused dpu_hw_blk features > drm/msm/dpu: drop dpu_hw_blk_destroy function > drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong > drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure > > drivers/gpu/drm/msm/Makefile | 1 - > .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 11 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c | 139 --------------------- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.h | 22 +--- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 7 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 6 - > drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 4 +- > 14 files changed, 10 insertions(+), 220 deletions(-) > delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_blk.c > > -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-06-04 21:15 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-15 19:09 [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov 2021-05-15 19:09 ` [PATCH v3 1/4] drm/msm/dpu: remove unused dpu_hw_blk features Dmitry Baryshkov 2021-06-04 21:08 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 2/4] drm/msm/dpu: drop dpu_hw_blk_destroy function Dmitry Baryshkov 2021-06-04 21:08 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 3/4] drm/msm/dpu: use struct dpu_hw_merge_3d in dpu_hw_pingpong Dmitry Baryshkov 2021-06-04 21:09 ` [Freedreno] " abhinavk 2021-05-15 19:09 ` [PATCH v3 4/4] drm/msm/dpu: hw_blk: make dpu_hw_blk empty opaque structure Dmitry Baryshkov 2021-06-04 21:15 ` [Freedreno] " abhinavk 2021-06-02 21:43 ` [PATCH v3 0/3] drm/msm/dpu: simplify dpu_hw_blk handling Dmitry Baryshkov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).