diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-29 11:35:47 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-29 11:36:42 -0500 |
| commit | 76ceff3417336f4f423489381741029837819387 (patch) | |
| tree | f06d8b8ed13b248602e38b9d0efa6b2b13b6be2c /drm-i915-hush-check-crtc-state.patch | |
| parent | d0ca4d59a1dc6d1e13babfaa093b0ee8b03cfdb6 (diff) | |
| download | kernel-76ceff3417336f4f423489381741029837819387.tar.gz kernel-76ceff3417336f4f423489381741029837819387.tar.xz kernel-76ceff3417336f4f423489381741029837819387.zip | |
Backport patch from Rob Clark to toggle i915 state machine checks
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
| -rw-r--r-- | drm-i915-hush-check-crtc-state.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 7709e6b67..6e25762b8 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,14 +14,14 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index e7a16f119a29..e1489e6c0dc7 100644 +index 76cd2205bc9c..b1285eec32ba 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10869,7 +10869,7 @@ check_crtc_state(struct drm_device *dev) if (active && !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { -- WARN(1, "pipe state doesn't match!\n"); +- I915_STATE_WARN(1, "pipe state doesn't match!\n"); + DRM_DEBUG_KMS("pipe state doesn't match!\n"); intel_dump_pipe_config(crtc, &pipe_config, "[hw state]"); |