| Message ID | 20190524173231.5040-2-sean@poorly.run (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/msm/dpu: Use provided drm_minor to initialize debugfs | expand |
On 2019-05-24 10:32, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > Fold it into dpu_debugfs_init. > > Cc: Stephen Boyd <swboyd@chromium.org> > Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index d77071965431..0a8c334c3a9f 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -231,8 +231,9 @@ void *dpu_debugfs_create_regset32(const char > *name, umode_t mode, > regset, &dpu_fops_regset32); > } > > -static int _dpu_debugfs_init(struct dpu_kms *dpu_kms, struct drm_minor > *minor) > +static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor > *minor) > { > + struct dpu_kms *dpu_kms = to_dpu_kms(kms); > void *p = dpu_hw_util_get_log_mask_ptr(); > struct dentry *entry; > > @@ -578,13 +579,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms > *dpu_kms) > return ret; > } > > -#ifdef CONFIG_DEBUG_FS > -static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor > *minor) > -{ > - return _dpu_debugfs_init(to_dpu_kms(kms), minor); > -} > -#endif > - > static long dpu_kms_round_pixclk(struct msm_kms *kms, unsigned long > rate, > struct drm_encoder *encoder) > {
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index d77071965431..0a8c334c3a9f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -231,8 +231,9 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode, regset, &dpu_fops_regset32); } -static int _dpu_debugfs_init(struct dpu_kms *dpu_kms, struct drm_minor *minor) +static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) { + struct dpu_kms *dpu_kms = to_dpu_kms(kms); void *p = dpu_hw_util_get_log_mask_ptr(); struct dentry *entry; @@ -578,13 +579,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) return ret; } -#ifdef CONFIG_DEBUG_FS -static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) -{ - return _dpu_debugfs_init(to_dpu_kms(kms), minor); -} -#endif - static long dpu_kms_round_pixclk(struct msm_kms *kms, unsigned long rate, struct drm_encoder *encoder) {