| Message ID | 20210930140002.308628-4-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm/msm/dpu: cleanup plane state | expand |
On 2021-09-30 06:59, Dmitry Baryshkov wrote: > Use plane->name instead of artificial pipe_name. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > index 88d726133b8b..ef3737642b0c 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -115,7 +115,6 @@ struct dpu_plane { > struct dpu_csc_cfg *csc_ptr; > > const struct dpu_sspp_sub_blks *pipe_sblk; > - char pipe_name[DPU_NAME_SIZE]; > > /* debugfs related stuff */ > struct dentry *debugfs_root; > @@ -1429,7 +1428,7 @@ static int _dpu_plane_init_debugfs(struct > drm_plane *plane) > > /* create overall sub-directory for the pipe */ > pdpu->debugfs_root = > - debugfs_create_dir(pdpu->pipe_name, > + debugfs_create_dir(plane->name, > plane->dev->primary->debugfs_root); > > /* don't error check these */ > @@ -1660,12 +1659,9 @@ struct drm_plane *dpu_plane_init(struct > drm_device *dev, > /* success! finalize initialization */ > drm_plane_helper_add(plane, &dpu_plane_helper_funcs); > > - /* save user friendly pipe name for later */ > - snprintf(pdpu->pipe_name, DPU_NAME_SIZE, "plane%u", plane->base.id); > - > mutex_init(&pdpu->lock); > > - DPU_DEBUG("%s created for pipe:%u id:%u virtual:%u\n", > pdpu->pipe_name, > + DPU_DEBUG("%s created for pipe:%u id:%u virtual:%u\n", plane->name, > pipe, plane->base.id, master_plane_id); > return plane;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 88d726133b8b..ef3737642b0c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -115,7 +115,6 @@ struct dpu_plane { struct dpu_csc_cfg *csc_ptr; const struct dpu_sspp_sub_blks *pipe_sblk; - char pipe_name[DPU_NAME_SIZE]; /* debugfs related stuff */ struct dentry *debugfs_root; @@ -1429,7 +1428,7 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane) /* create overall sub-directory for the pipe */ pdpu->debugfs_root = - debugfs_create_dir(pdpu->pipe_name, + debugfs_create_dir(plane->name, plane->dev->primary->debugfs_root); /* don't error check these */ @@ -1660,12 +1659,9 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev, /* success! finalize initialization */ drm_plane_helper_add(plane, &dpu_plane_helper_funcs); - /* save user friendly pipe name for later */ - snprintf(pdpu->pipe_name, DPU_NAME_SIZE, "plane%u", plane->base.id); - mutex_init(&pdpu->lock); - DPU_DEBUG("%s created for pipe:%u id:%u virtual:%u\n", pdpu->pipe_name, + DPU_DEBUG("%s created for pipe:%u id:%u virtual:%u\n", plane->name, pipe, plane->base.id, master_plane_id); return plane;
Use plane->name instead of artificial pipe_name. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)