remove queue-3.1/drm-i915-fix-ilk-infoframe-support.patch as it breaks things

diff --git a/queue-3.1/drm-i915-fix-ilk-infoframe-support.patch b/queue-3.1/drm-i915-fix-ilk-infoframe-support.patch
deleted file mode 100644 (file)
index 71ee809..0000000
--- a/queue-3.1/drm-i915-fix-ilk-infoframe-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 64a8fc0145a1d0fdc25fc9367c2e6c621955fb3b Mon Sep 17 00:00:00 2001
-From: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date: Thu, 22 Sep 2011 11:16:00 +0530
-Subject: drm/i915: fix ILK+ infoframe support
-
-From: Jesse Barnes <jbarnes@virtuousgeek.org>
-
-commit 64a8fc0145a1d0fdc25fc9367c2e6c621955fb3b upstream.
-
-Misc fixes based on tests with an infoframe analyzer:
-  - checksum *does* include header bytes
-  - DIP enable & AVI infoframe are tied together in hw, so disable both
-    and make sure AVI frames are enabled first
-  - use every vsync flag for SPD frames to avoid reserved value in
-    frequency field when enabling both AVI & SPD
-
-Fixes https://bugs.freedesktop.org/show_bug.cgi?id=40281.
-
-Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/gpu/drm/i915/intel_hdmi.c |   18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
---- a/drivers/gpu/drm/i915/intel_hdmi.c
-+++ b/drivers/gpu/drm/i915/intel_hdmi.c
-@@ -69,8 +69,7 @@ void intel_dip_infoframe_csum(struct dip
-       frame->checksum = 0;
-       frame->ecc = 0;
- 
--      /* Header isn't part of the checksum */
--      for (i = 5; i < frame->len; i++)
-+      for (i = 0; i < frame->len + DIP_HEADER_SIZE; i++)
-               sum += data[i];
- 
-       frame->checksum = 0x100 - sum;
-@@ -104,7 +103,7 @@ static u32 intel_infoframe_flags(struct
-               flags |= VIDEO_DIP_ENABLE_AVI | VIDEO_DIP_FREQ_VSYNC;
-               break;
-       case DIP_TYPE_SPD:
--              flags |= VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_FREQ_2VSYNC;
-+              flags |= VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_FREQ_VSYNC;
-               break;
-       default:
-               DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
-@@ -165,9 +164,9 @@ static void ironlake_write_infoframe(str
- 
-       flags = intel_infoframe_index(frame);
- 
--      val &= ~VIDEO_DIP_SELECT_MASK;
-+      val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
- 
--      I915_WRITE(reg, val | flags);
-+      I915_WRITE(reg, VIDEO_DIP_ENABLE | val | flags);
- 
-       for (i = 0; i < len; i += 4) {
-               I915_WRITE(TVIDEO_DIP_DATA(intel_crtc->pipe), *data);
-@@ -486,6 +485,7 @@ void intel_hdmi_init(struct drm_device *
-       struct intel_encoder *intel_encoder;
-       struct intel_connector *intel_connector;
-       struct intel_hdmi *intel_hdmi;
-+      int i;
- 
-       intel_hdmi = kzalloc(sizeof(struct intel_hdmi), GFP_KERNEL);
-       if (!intel_hdmi)
-@@ -538,10 +538,14 @@ void intel_hdmi_init(struct drm_device *
- 
-       intel_hdmi->sdvox_reg = sdvox_reg;
- 
--      if (!HAS_PCH_SPLIT(dev))
-+      if (!HAS_PCH_SPLIT(dev)) {
-               intel_hdmi->write_infoframe = i9xx_write_infoframe;
--      else
-+              I915_WRITE(VIDEO_DIP_CTL, 0);
-+      } else {
-               intel_hdmi->write_infoframe = ironlake_write_infoframe;
-+              for_each_pipe(i)
-+                      I915_WRITE(TVIDEO_DIP_CTL(i), 0);
-+      }
- 
-       drm_encoder_helper_add(&intel_encoder->base, &intel_hdmi_helper_funcs);
- 

diff --git a/queue-3.1/series b/queue-3.1/series
index af57bc25acae7b1cfd6fa1bf51b43f2bc24612a5..addbaa58a983ad30e86837dfadcdb94d52088416 100644 (file)
--- a/queue-3.1/series
+++ b/queue-3.1/series
@@ -20,7 +20,6 @@ xhci-mem.c-check-for-ring-first_seg-null.patch
 xhci-amd-isoc-link-trb-chain-bit-quirk.patch
 drm-i915-wrap-dp-edid-fetch-functions-to-enable-edp-panel.patch
 drm-i915-panel-always-record-the-backlight-level-again-but-cleverly.patch
-drm-i915-fix-ilk-infoframe-support.patch
 drm-i915-use-correct-spd-type-value.patch
 drm-radeon-kms-bail-early-in-dvi_detect-for-digital-only-connectors.patch
 drm-radeon-kms-handle-force-case-in-connector-detect-more-gracefully.patch