diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-20 20:36:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-20 20:37:31 -0400 |
| commit | cbe4b5e00edb34c3c1b4acdb800f230062eb2b47 (patch) | |
| tree | c0b148309f62983f264cb3cd305279aee74d1446 /drm-i915-hush-check-crtc-state.patch | |
| parent | c8c04852223c8f192e9e33234b792f115dd32ddb (diff) | |
| download | kernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.tar.gz kernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.tar.xz kernel-cbe4b5e00edb34c3c1b4acdb800f230062eb2b47.zip | |
Linux v4.0-8962-g14aa02449064
DRM merge
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 bd927d2f6..56692986e 100644 --- a/drm-i915-hush-check-crtc-state.patch +++ b/drm-i915-hush-check-crtc-state.patch @@ -14,10 +14,10 @@ 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 f75173c20f47..1003782a38c4 100644 +index d547d9c8dda2..f523ee679987 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -10917,7 +10917,7 @@ check_crtc_state(struct drm_device *dev) +@@ -11308,7 +11308,7 @@ check_crtc_state(struct drm_device *dev) if (active && !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) { |