3.1 patches

added patches:
	drm-i915-always-set-fdi-composite-sync-bit.patch
	drm-i915-fix-ivb-cursor-support.patch

diff --git a/queue-3.1/drm-i915-always-set-fdi-composite-sync-bit.patch b/queue-3.1/drm-i915-always-set-fdi-composite-sync-bit.patch
new file mode 100644 (file)
index 0000000..04ca381
--- /dev/null
+++ b/queue-3.1/drm-i915-always-set-fdi-composite-sync-bit.patch
@@ -0,0 +1,52 @@
+From c4f9c4c2b3f1831e932e04db992cf6fe92c2a95a Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Mon, 10 Oct 2011 14:28:52 -0700
+Subject: drm/i915: always set FDI composite sync bit
+
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit c4f9c4c2b3f1831e932e04db992cf6fe92c2a95a upstream.
+
+It's needed for 3 pipe support as well as just regular functionality
+(e.g. DisplayPort).
+
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Tested-by: Adam Jackson <ajax@redhat.com>
+Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/i915/i915_reg.h      |    1 +
+ drivers/gpu/drm/i915/intel_display.c |    2 ++
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -3175,6 +3175,7 @@
+ #define  FDI_LINK_TRAIN_NONE_IVB            (3<<8)
+ 
+ /* both Tx and Rx */
++#define  FDI_COMPOSITE_SYNC           (1<<11)
+ #define  FDI_LINK_TRAIN_AUTO          (1<<10)
+ #define  FDI_SCRAMBLING_ENABLE          (0<<7)
+ #define  FDI_SCRAMBLING_DISABLE         (1<<7)
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -2600,6 +2600,7 @@ static void ivb_manual_fdi_link_train(st
+       temp |= FDI_LINK_TRAIN_PATTERN_1_IVB;
+       temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK;
+       temp |= FDI_LINK_TRAIN_400MV_0DB_SNB_B;
++      temp |= FDI_COMPOSITE_SYNC;
+       I915_WRITE(reg, temp | FDI_TX_ENABLE);
+ 
+       reg = FDI_RX_CTL(pipe);
+@@ -2607,6 +2608,7 @@ static void ivb_manual_fdi_link_train(st
+       temp &= ~FDI_LINK_TRAIN_AUTO;
+       temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT;
+       temp |= FDI_LINK_TRAIN_PATTERN_1_CPT;
++      temp |= FDI_COMPOSITE_SYNC;
+       I915_WRITE(reg, temp | FDI_RX_ENABLE);
+ 
+       POSTING_READ(reg);

diff --git a/queue-3.1/drm-i915-fix-ivb-cursor-support.patch b/queue-3.1/drm-i915-fix-ivb-cursor-support.patch
new file mode 100644 (file)
index 0000000..6bc895d
--- /dev/null
+++ b/queue-3.1/drm-i915-fix-ivb-cursor-support.patch
@@ -0,0 +1,101 @@
+From 65a21cd65316145f9302594be8e69074369e1050 Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed, 12 Oct 2011 11:10:21 -0700
+Subject: drm/i915: fix IVB cursor support
+
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 65a21cd65316145f9302594be8e69074369e1050 upstream.
+
+The cursor regs have moved around, add the offsets and new macros for
+getting at them.
+
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Tested-By: Eugeni Dodonov <eugeni.dodonov@intel.com>
+Reviewed-By: Eugeni Dodonov <eugeni.dodonov@intel.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/i915/i915_reg.h      |    8 +++++++
+ drivers/gpu/drm/i915/intel_display.c |   40 ++++++++++++++++++++++++++++++-----
+ 2 files changed, 43 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -2554,10 +2554,18 @@
+ #define _CURBBASE             0x700c4
+ #define _CURBPOS                      0x700c8
+ 
++#define _CURBCNTR_IVB         0x71080
++#define _CURBBASE_IVB         0x71084
++#define _CURBPOS_IVB          0x71088
++
+ #define CURCNTR(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR)
+ #define CURBASE(pipe) _PIPE(pipe, _CURABASE, _CURBBASE)
+ #define CURPOS(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS)
+ 
++#define CURCNTR_IVB(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR_IVB)
++#define CURBASE_IVB(pipe) _PIPE(pipe, _CURABASE, _CURBBASE_IVB)
++#define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB)
++
+ /* Display A control */
+ #define _DSPACNTR                0x70180
+ #define   DISPLAY_PLANE_ENABLE                        (1<<31)
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -5758,6 +5758,31 @@ static void i9xx_update_cursor(struct dr
+       I915_WRITE(CURBASE(pipe), base);
+ }
+ 
++static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)
++{
++      struct drm_device *dev = crtc->dev;
++      struct drm_i915_private *dev_priv = dev->dev_private;
++      struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
++      int pipe = intel_crtc->pipe;
++      bool visible = base != 0;
++
++      if (intel_crtc->cursor_visible != visible) {
++              uint32_t cntl = I915_READ(CURCNTR_IVB(pipe));
++              if (base) {
++                      cntl &= ~CURSOR_MODE;
++                      cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
++              } else {
++                      cntl &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE);
++                      cntl |= CURSOR_MODE_DISABLE;
++              }
++              I915_WRITE(CURCNTR_IVB(pipe), cntl);
++
++              intel_crtc->cursor_visible = visible;
++      }
++      /* and commit changes on next vblank */
++      I915_WRITE(CURBASE_IVB(pipe), base);
++}
++
+ /* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
+ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
+                                    bool on)
+@@ -5805,11 +5830,16 @@ static void intel_crtc_update_cursor(str
+       if (!visible && !intel_crtc->cursor_visible)
+               return;
+ 
+-      I915_WRITE(CURPOS(pipe), pos);
+-      if (IS_845G(dev) || IS_I865G(dev))
+-              i845_update_cursor(crtc, base);
+-      else
+-              i9xx_update_cursor(crtc, base);
++      if (IS_IVYBRIDGE(dev)) {
++              I915_WRITE(CURPOS_IVB(pipe), pos);
++              ivb_update_cursor(crtc, base);
++      } else {
++              I915_WRITE(CURPOS(pipe), pos);
++              if (IS_845G(dev) || IS_I865G(dev))
++                      i845_update_cursor(crtc, base);
++              else
++                      i9xx_update_cursor(crtc, base);
++      }
+ 
+       if (visible)
+               intel_mark_busy(dev, to_intel_framebuffer(crtc->fb)->obj);

diff --git a/queue-3.1/series b/queue-3.1/series
index dd2e2af1f30df3093ce95baef206a93aca64ba46..0a72504cb4e3f5b502e33dcd82b7928addc7d7b6 100644 (file)
--- a/queue-3.1/series
+++ b/queue-3.1/series
@@ -43,3 +43,5 @@ usb-storage-accept-8020i-protocol-commands-longer-than-12-bytes.patch
 usb-ehci-fix-hub-tt-scheduling-issue-with-iso-transfer.patch
 usb-add-quirk-for-logitech-c600-web-cam.patch
 usb-quirks-adding-more-quirky-webcams-to-avoid-squeaky-audio.patch
+drm-i915-fix-ivb-cursor-support.patch
+drm-i915-always-set-fdi-composite-sync-bit.patch