Merge tag 'drm-msm-next-2019-11-05' of https://gitlab.freedesktop.org/drm/msm into...

[linux.git] / drivers / gpu / drm / msm / disp / dpu1 / dpu_kms.h

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index 6ceba33a179ea83d9a398fdb401eda60f3486b51..c6169e7df19de562818eae30c20977cea9de9a34 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -31,7 +31,7 @@
  */
 #define DPU_DEBUG(fmt, ...)                                                \
        do {                                                               \
-               if (unlikely(drm_debug & DRM_UT_KMS))                      \
+               if (drm_debug_enabled(DRM_UT_KMS))                         \
                        DRM_DEBUG(fmt, ##__VA_ARGS__); \
                else                                                       \
                        pr_debug(fmt, ##__VA_ARGS__);                      \
@@ -43,7 +43,7 @@
  */
 #define DPU_DEBUG_DRIVER(fmt, ...)                                         \
        do {                                                               \
-               if (unlikely(drm_debug & DRM_UT_DRIVER))                   \
+               if (drm_debug_enabled(DRM_UT_DRIVER))                      \
                        DRM_ERROR(fmt, ##__VA_ARGS__); \
                else                                                       \
                        pr_debug(fmt, ##__VA_ARGS__);                      \