On Thu, Oct 18, 2018 at 3:59 PM Jordan Crouse <jcrouse@xxxxxxxxxxxxxx> wrote:
>
> The functions in dpu_dbg.c aren't used. The two main dump functions
> fail after a lookup from dpu_dbg_base.reg_base_list which turns out
> to never be populated and once those are removed the rest of the
> file doesn't make any sense.
>
> Signed-off-by: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/Makefile | 3 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c | 2393 -----------------
> drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.h | 103 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 +-
> .../drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 1 -
> .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 1 -
> .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 3 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 20 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 -
> 15 files changed, 8 insertions(+), 2547 deletions(-)
> delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c
> delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.h
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 82c55efb500f..5559e5d40142 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1494,10 +1494,8 @@ static void dpu_encoder_helper_hw_reset(struct
> dpu_encoder_phys *phys_enc)
> ctl->idx);
>
> rc = ctl->ops.reset(ctl);
> - if (rc) {
> + if (rc)
> DPU_ERROR_ENC(dpu_enc, "ctl %d reset failure\n", ctl->idx);
> - dpu_dbg_dump(false, __func__, true, true);
> - }
>
> phys_enc->enable_state = DPU_ENC_ENABLED;
> }
> @@ -1838,7 +1836,7 @@ void dpu_encoder_prepare_commit(struct
> drm_encoder *drm_enc)
> }
>
> #ifdef CONFIG_DEBUG_FS
> -static int _dpu_encoder_status_show(struct seq_file *s, void *data)
> +static int dpu_encoder_status_show(struct seq_file *s, void *data)
> {
> struct dpu_encoder_virt *dpu_enc;
> int i;
> @@ -1877,11 +1875,7 @@ static int _dpu_encoder_status_show(struct
> seq_file *s, void *data)
> return 0;
> }
>
> -static int _dpu_encoder_debugfs_status_open(struct inode *inode,
> - struct file *file)
> -{
> - return single_open(file, _dpu_encoder_status_show, inode->i_private);
> -}
> +DEFINE_SHOW_ATTRIBUTE(dpu_encoder_status);
>
> static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
> {
> @@ -1889,14 +1883,6 @@ static int _dpu_encoder_init_debugfs(struct
> drm_encoder *drm_enc)
> struct msm_drm_private *priv;
> struct dpu_kms *dpu_kms;
> int i;
> -
> - static const struct file_operations debugfs_status_fops = {
> - .open = _dpu_encoder_debugfs_status_open,
> - .read = seq_read,
> - .llseek = seq_lseek,
> - .release = single_release,
> - };
> -
> char name[DPU_NAME_SIZE];
>
> if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
> @@ -1917,8 +1903,8 @@ static int _dpu_encoder_init_debugfs(struct
> drm_encoder *drm_enc)
> return -ENOMEM;
>
> /* don't error check these */
> - debugfs_create_file("status", 0600,
> - dpu_enc->debugfs_root, dpu_enc, &debugfs_status_fops);
> + debugfs_create_file("status", 0600, dpu_enc->debugfs_root, dpu_enc,
> + &dpu_encoder_status_fops);
>
Sorry about that, apparently my client does not like responding to long emails.
My only comment was that this section looks like it should be in patch 2.
With that change:
Reviewed-by: Bruce Wang <bzwang@xxxxxxxxxxxx>
> for (i = 0; i < dpu_enc->num_phys_encs; i++)
> if (dpu_enc->phys_encs[i] &&
