From: Jani Nikula <jani.nikula@intel•com>
To: intel-gfx@lists•freedesktop.org
Cc: Rob Clark <robdclark@gmail•com>, Jim Davis <jim.epost@gmail•com>,
jani.nikula@intel•com, Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next <linux-next@vger•kernel.org>,
linux-kernel <linux-kernel@vger•kernel.org>,
daniel.vetter@intel•com, David Airlie <airlied@linux•ie>,
dri-devel <dri-devel@lists•freedesktop.org>
Subject: [PATCH] drm/i915: fix build for CONFIG_BUG=n
Date: Mon, 12 Jan 2015 15:45:31 +0200 [thread overview]
Message-ID: <1421070331-29650-1-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <CA+r1ZhgHTi7bS2irhtuSUs9aO=Br1dumN8=oAOeaMJDZ_ZhwBw@mail.gmail.com>
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>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
1 file 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 @@
int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) { \
if (i915.verbose_state_checks) \
- __WARN_printf(format); \
+ WARN(1, format); \
else \
DRM_ERROR(format); \
} \
@@ -94,7 +94,7 @@
int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) { \
if (i915.verbose_state_checks) \
- __WARN_printf("WARN_ON(" #condition ")\n"); \
+ WARN(1, "WARN_ON(" #condition ")\n"); \
else \
DRM_ERROR("WARN_ON(" #condition ")\n"); \
} \
--
2.1.4
prev parent reply other threads:[~2015-01-12 13:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-09 16:22 randconfig build error with next-20150109, in drivers/gpu/drm/i915/intel_display.c Jim Davis
2015-01-12 13:45 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421070331-29650-1-git-send-email-jani.nikula@intel.com \
--to=jani.nikula@intel$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=daniel.vetter@intel$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jim.epost@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox