diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-17 10:18:24 -0500 |
| commit | 08f431fa3ad32081c754b2ba5346eb1337a63b89 (patch) | |
| tree | 031cba201cd5612ec8a1a64a38d7ee1e73a7030d /drm-i915-hush-check-crtc-state.patch | |
| parent | c438599162b0da1365ac1ea1a03e16586fc47e77 (diff) | |
| download | kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.gz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.tar.xz kernel-08f431fa3ad32081c754b2ba5346eb1337a63b89.zip | |
Linux v3.19-7478-g796e1c55717e
- DRM merge
Diffstat (limited to 'drm-i915-hush-check-crtc-state.patch')
| -rw-r--r-- | drm-i915-hush-check-crtc-state.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch index 6e25762b8..7a818a681 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,18 +14,18 @@ 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 76cd2205bc9c..b1285eec32ba 100644 +index 3d220a67f865..8e18e0575d52 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) +@@ -10870,7 +10870,7 @@ check_crtc_state(struct drm_device *dev) if (active && - !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { + !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) { - 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]"); - intel_dump_pipe_config(crtc, &crtc->config, + intel_dump_pipe_config(crtc, crtc->config, -- 2.1.0 |