| Message ID | 20210721175526.22020-5-sean@poorly.run (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | None | expand |
On 21/07/2021 20:55, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > The debug messages shouldn't be logged as errors when debug categories > are enabled. Use the drm logging helpers to do the right thing > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-5-sean@poorly.run #v5 The patch seems correct, but I'd propose another approach. There is just 1 user of DPU_DEBUG_DRIVER and 29 users of DPU_DEBUG. So we might instead replace them with DRM_DEBUG_* calls and drop the DPU_DEBUG/DPU_DEBUG_DRIVER altogether. DPU_ERROR is used in ~190 places, so it will be more intrusive, but still doable. > Changes in v5: > -Added to the set > Changes in v6: > -None > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > index 323a6bce9e64..c33164d3944a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > @@ -31,27 +31,15 @@ > * DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs > * @fmt: Pointer to format string > */ > -#define DPU_DEBUG(fmt, ...) \ > - do { \ > - if (drm_debug_enabled(DRM_UT_KMS)) \ > - DRM_DEBUG(fmt, ##__VA_ARGS__); \ > - else \ > - pr_debug(fmt, ##__VA_ARGS__); \ > - } while (0) > +#define DPU_DEBUG(fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__) > > /** > * DPU_DEBUG_DRIVER - macro for hardware driver logging > * @fmt: Pointer to format string > */ > -#define DPU_DEBUG_DRIVER(fmt, ...) \ > - do { \ > - if (drm_debug_enabled(DRM_UT_DRIVER)) \ > - DRM_ERROR(fmt, ##__VA_ARGS__); \ > - else \ > - pr_debug(fmt, ##__VA_ARGS__); \ > - } while (0) > - > -#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) > +#define DPU_DEBUG_DRIVER(fmt, ...) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) > + > +#define DPU_ERROR(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) > > /** > * ktime_compare_safe - compare two ktime structures >
On 2021-07-21 10:55, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > The debug messages shouldn't be logged as errors when debug categories > are enabled. Use the drm logging helpers to do the right thing > > Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> > Link: > https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-5-sean@poorly.run > #v5 > > Changes in v5: > -Added to the set > Changes in v6: > -None > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > index 323a6bce9e64..c33164d3944a 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h > @@ -31,27 +31,15 @@ > * DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs > * @fmt: Pointer to format string > */ > -#define DPU_DEBUG(fmt, ...) > \ > - do { \ > - if (drm_debug_enabled(DRM_UT_KMS)) \ > - DRM_DEBUG(fmt, ##__VA_ARGS__); \ > - else \ > - pr_debug(fmt, ##__VA_ARGS__); \ > - } while (0) > +#define DPU_DEBUG(fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__) > > /** > * DPU_DEBUG_DRIVER - macro for hardware driver logging > * @fmt: Pointer to format string > */ > -#define DPU_DEBUG_DRIVER(fmt, ...) > \ > - do { \ > - if (drm_debug_enabled(DRM_UT_DRIVER)) \ > - DRM_ERROR(fmt, ##__VA_ARGS__); \ > - else \ > - pr_debug(fmt, ##__VA_ARGS__); \ > - } while (0) > - > -#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) > +#define DPU_DEBUG_DRIVER(fmt, ...) DRM_DEBUG_DRIVER(fmt, > ##__VA_ARGS__) > + > +#define DPU_ERROR(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) > > /** > * ktime_compare_safe - compare two ktime structures
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index 323a6bce9e64..c33164d3944a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -31,27 +31,15 @@ * DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs * @fmt: Pointer to format string */ -#define DPU_DEBUG(fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_KMS)) \ - DRM_DEBUG(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) +#define DPU_DEBUG(fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__) /** * DPU_DEBUG_DRIVER - macro for hardware driver logging * @fmt: Pointer to format string */ -#define DPU_DEBUG_DRIVER(fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_DRIVER)) \ - DRM_ERROR(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) - -#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) +#define DPU_DEBUG_DRIVER(fmt, ...) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) + +#define DPU_ERROR(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) /** * ktime_compare_safe - compare two ktime structures