| From 10a2b7443fcf4d6ee975d992252d2e1a1a55c009 Mon Sep 17 00:00:00 2001 |
| From: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Date: Mon, 1 Jul 2013 10:19:09 -0700 |
| Subject: drm/i915: fixup messages in pipe_config_compare |
| |
| Print out the flag that failed and fix up a mismatched paren. |
| |
| Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 6f02488e3a5cbd76974b9d56140b11f3aa012124) |
| (cherry picked from drm-intel-next-queued) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index b902399f367f..1910cc9725fa 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -8170,7 +8170,7 @@ intel_pipe_config_compare(struct drm_device *dev, |
| |
| #define PIPE_CONF_CHECK_FLAGS(name, mask) \ |
| if ((current_config->name ^ pipe_config->name) & (mask)) { \ |
| - DRM_ERROR("mismatch in " #name " " \ |
| + DRM_ERROR("mismatch in " #name "(" #mask ") " \ |
| "(expected %i, found %i)\n", \ |
| current_config->name & (mask), \ |
| pipe_config->name & (mask)); \ |
| @@ -8246,7 +8246,7 @@ intel_pipe_config_compare(struct drm_device *dev, |
| |
| if (!IS_HASWELL(dev)) { |
| if (!intel_fuzzy_clock_check(current_config, pipe_config)) { |
| - DRM_ERROR("mismatch in clock (expected %d, found %d\n", |
| + DRM_ERROR("mismatch in clock (expected %d, found %d)\n", |
| current_config->adjusted_mode.clock, |
| pipe_config->adjusted_mode.clock); |
| return false; |
| -- |
| 1.8.5.rc3 |
| |
