aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2015-01-12 08:45:31 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-01-12 17:43:09 -0500
commit2f3408c7ef471dea10b8c89932f581c9c2eaf6ef (patch)
tree3e1ed9ff83064ebb1dffb9e6900f27f5b0766e94 /drivers/gpu/drm
parent0a87a2db485a1456b7427914969c0e8195a1bbda (diff)
drm/i915: fix build for CONFIG_BUG=n
If CONFIG_BUG=n __WARN_printf won't be defined leading to the below build failure. The double underscores should have told us to steer clear of it anyway. drivers/gpu/drm/i915/intel_display.c: In function ‘assert_pll’: drivers/gpu/drm/i915/intel_display.c:1027:2: error: implicit declaration of function ‘__WARN_printf’ [-Werror=implicit-function-declaration] I915_STATE_WARN(cur_state != state, Use WARN(1, ...) instead. It handles CONFIG_BUG=n gracefully and, with the constant condition, a sane compiler should reduce it to __WARN_printf. This is a regression introduced by commit e2c719b75c8c186deb86570d8466df9e9eff919b Author: Rob Clark <robdclark@gmail.com> Date: Mon Dec 15 13:56:32 2014 -0500 drm/i915: tame the chattermouth (v2) Reported-by: Jim Davis <jim.epost@gmail.com> Reference: http://mid.gmane.org/CA+r1ZhgHTi7bS2irhtuSUs9aO=Br1dumN8=oAOeaMJDZ_ZhwBw@mail.gmail.com Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e008fa0c58da..66f0c607dbef 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -83,7 +83,7 @@
83 int __ret_warn_on = !!(condition); \ 83 int __ret_warn_on = !!(condition); \
84 if (unlikely(__ret_warn_on)) { \ 84 if (unlikely(__ret_warn_on)) { \
85 if (i915.verbose_state_checks) \ 85 if (i915.verbose_state_checks) \
86 __WARN_printf(format); \ 86 WARN(1, format); \
87 else \ 87 else \
88 DRM_ERROR(format); \ 88 DRM_ERROR(format); \
89 } \ 89 } \
@@ -94,7 +94,7 @@
94 int __ret_warn_on = !!(condition); \ 94 int __ret_warn_on = !!(condition); \
95 if (unlikely(__ret_warn_on)) { \ 95 if (unlikely(__ret_warn_on)) { \
96 if (i915.verbose_state_checks) \ 96 if (i915.verbose_state_checks) \
97 __WARN_printf("WARN_ON(" #condition ")\n"); \ 97 WARN(1, "WARN_ON(" #condition ")\n"); \
98 else \ 98 else \
99 DRM_ERROR("WARN_ON(" #condition ")\n"); \ 99 DRM_ERROR("WARN_ON(" #condition ")\n"); \
100 } \ 100 } \