diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-19 18:38:56 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-07-29 18:09:06 -0400 |
commit | 013a41ec541d5daa0c9f2b5126d2e820902c052d (patch) | |
tree | 29af246cd26868f2846f2a4b61e6a58ae5d0d5f5 /drivers/gpu/drm/i915 | |
parent | 358733e9047cafcc185ca19b8c369c659ac0c4cf (diff) |
drm/i915: provide more error output when mode sets fail
If a mode set fails we may get a message from drm_crtc_helper if we're lucky,
but it won't tell us anything about *why* we failed to set a mode. So
add a few DRM_ERRORs for the cases that shouldn't happen so we can debug
things more easily.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 32c8c956d975..d2fb8cf3de0d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1958,7 +1958,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
1958 | 1958 | ||
1959 | /* no fb bound */ | 1959 | /* no fb bound */ |
1960 | if (!crtc->fb) { | 1960 | if (!crtc->fb) { |
1961 | DRM_DEBUG_KMS("No FB bound\n"); | 1961 | DRM_ERROR("No FB bound\n"); |
1962 | return 0; | 1962 | return 0; |
1963 | } | 1963 | } |
1964 | 1964 | ||
@@ -1967,6 +1967,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
1967 | case 1: | 1967 | case 1: |
1968 | break; | 1968 | break; |
1969 | default: | 1969 | default: |
1970 | DRM_ERROR("no plane for crtc\n"); | ||
1970 | return -EINVAL; | 1971 | return -EINVAL; |
1971 | } | 1972 | } |
1972 | 1973 | ||
@@ -1976,6 +1977,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
1976 | NULL); | 1977 | NULL); |
1977 | if (ret != 0) { | 1978 | if (ret != 0) { |
1978 | mutex_unlock(&dev->struct_mutex); | 1979 | mutex_unlock(&dev->struct_mutex); |
1980 | DRM_ERROR("pin & fence failed\n"); | ||
1979 | return ret; | 1981 | return ret; |
1980 | } | 1982 | } |
1981 | 1983 | ||
@@ -2004,6 +2006,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
2004 | if (ret) { | 2006 | if (ret) { |
2005 | i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); | 2007 | i915_gem_object_unpin(to_intel_framebuffer(crtc->fb)->obj); |
2006 | mutex_unlock(&dev->struct_mutex); | 2008 | mutex_unlock(&dev->struct_mutex); |
2009 | DRM_ERROR("failed to update base address\n"); | ||
2007 | return ret; | 2010 | return ret; |
2008 | } | 2011 | } |
2009 | 2012 | ||