Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

Daniel Vetter wrote
First pull request for 3.5-next, slightly large than usual because new
things kept coming in since the last pull for 3.4.
Highlights:
- first batch of hw enablement for vlv (Jesse et al) and hsw (Eugeni). pci
 ids are not yet added, and there's still quite a few patches to merge
 (mostly modesetting). To make QA easier I've decided to merge this stuff
 in pieces.
- loads of cleanups and prep patches spurred by the above. Especially vlv
 is a real frankenstein chip, but also hsw is stretching our driver's
 code design. Expect more to come in this area for 3.5.
- more gmbus fixes, cleanups and improvements by Daniel Kurtz. Again,
 there are more patches needed (and some already queued up), but I wanted
 to split this a bit for better testing.
- pwrite/pread rework and retuning. This series has been in the works for
 a few months already and a lot of i-g-t tests have been created for it.
 Now it's finally ready to be merged.  Note that one patch in this series
 touches include/pagemap.h, that patch is acked-by akpm.
- reduce mappable pressure and relocation throughput improvements from
 Chris.
- mmap offset exhaustion mitigation by Chris Wilson.
- a start at figuring out which codepaths in our messy dri1/ums+gem/kms
 driver we actually need to support by bailing out of unsupported case.
 The driver now refuses to load without kms on gen6+ and disallows a few
 ioctls that userspace never used in certain cases. More of this will
 definitely come.
- More decoupling of global gtt and ppgtt.
- Improved dual-link lvds detection by Takashi Iwai.
- Shut up the compiler + plus fix the fallout (Ben)
- Inverted panel brightness handling (mostly Acer manages to break things
 in this way).
- Small fixlets and adjustements and some minor things to help debugging.

Regression-wise QA reported quite a few issues on ivb, but all of them
turned out to be hw stability issues which are already fixed in
drm-intel-fixes (QA runs the nightly regression tests on -next alone,
without -fixes automatically merged in). There's still one issue open on
snb, it looks like occlusion query writes are not quite as cache coherent
as we've expected. With some of the pwrite adjustements we can now
reliably hit this. Kernel workaround for it is in the works."

* 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)
  drm/i915: VCS is not the last ring
  drm/i915: Add a dual link lvds quirk for MacBook Pro 8,2
  drm/i915: make quirks more verbose
  drm/i915: dump the DMA fetch addr register on pre-gen6
  drm/i915/sdvo: Include YRPB as an additional TV output type
  drm/i915: disallow gem init ioctl on ilk
  drm/i915: refuse to load on gen6+ without kms
  drm/i915: extract gt interrupt handler
  drm/i915: use render gen to switch ring irq functions
  drm/i915: rip out old HWSTAM missed irq WA for vlv
  drm/i915: open code gen6+ ring irqs
  drm/i915: ring irq cleanups
  drm/i915: add SFUSE_STRAP registers for digital port detection
  drm/i915: add WM_LINETIME registers
  drm/i915: add WRPLL clocks
  drm/i915: add LCPLL control registers
  drm/i915: add SSC offsets for SBI access
  drm/i915: add port clock selection support for HSW
  drm/i915: add S PLL control
  drm/i915: add PIXCLK_GATE register
  ...

Conflicts:
	drivers/char/agp/intel-agp.h
	drivers/char/agp/intel-gtt.c
	drivers/gpu/drm/i915/i915_debugfs.c

1 files changed, 43 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index b48fc2a8410..353459362f6 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -174,6 +174,28 @@ get_lvds_dvo_timing(const struct bdb_lvds_lfp_data *lvds_lfp_data,
         return (struct lvds_dvo_timing *)(entry + dvo_timing_offset);
 }
 
+/* get lvds_fp_timing entry
+ * this function may return NULL if the corresponding entry is invalid
+ */
+static const struct lvds_fp_timing *
+get_lvds_fp_timing(const struct bdb_header *bdb,
+                   const struct bdb_lvds_lfp_data *data,
+                   const struct bdb_lvds_lfp_data_ptrs *ptrs,
+                   int index)
+{
+        size_t data_ofs = (const u8 *)data - (const u8 *)bdb;
+        u16 data_size = ((const u16 *)data)[-1]; /* stored in header */
+        size_t ofs;
+
+        if (index >= ARRAY_SIZE(ptrs->ptr))
+                return NULL;
+        ofs = ptrs->ptr[index].fp_timing_offset;
+        if (ofs < data_ofs ||
+            ofs + sizeof(struct lvds_fp_timing) > data_ofs + data_size)
+                return NULL;
+        return (const struct lvds_fp_timing *)((const u8 *)bdb + ofs);
+}
+
 /* Try to find integrated panel data */
 static void
 parse_lfp_panel_data(struct drm_i915_private *dev_priv,
@@ -183,6 +205,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
         const struct bdb_lvds_lfp_data *lvds_lfp_data;
         const struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
         const struct lvds_dvo_timing *panel_dvo_timing;
+        const struct lvds_fp_timing *fp_timing;
         struct drm_display_mode *panel_fixed_mode;
         int i, downclock;
 
@@ -244,6 +267,19 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv,
                               "Normal Clock %dKHz, downclock %dKHz\n",
                               panel_fixed_mode->clock, 10*downclock);
         }
+
+        fp_timing = get_lvds_fp_timing(bdb, lvds_lfp_data,
+                                       lvds_lfp_data_ptrs,
+                                       lvds_options->panel_type);
+        if (fp_timing) {
+                /* check the resolution, just to be sure */
+                if (fp_timing->x_res == panel_fixed_mode->hdisplay &&
+                    fp_timing->y_res == panel_fixed_mode->vdisplay) {
+                        dev_priv->bios_lvds_val = fp_timing->lvds_reg_val;
+                        DRM_DEBUG_KMS("VBT initial LVDS value %x\n",
+                                      dev_priv->bios_lvds_val);
+                }
+        }
 }
 
 /* Try to find sdvo panel data */
@@ -256,6 +292,11 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,
         int index;
 
         index = i915_vbt_sdvo_panel_type;
+        if (index == -2) {
+                DRM_DEBUG_KMS("Ignore SDVO panel mode from BIOS VBT tables.\n");
+                return;
+        }
+
         if (index == -1) {
                 struct bdb_sdvo_lvds_options *sdvo_lvds_options;
 
@@ -332,11 +373,11 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
                 if (block_size >= sizeof(*general)) {
                         int bus_pin = general->crt_ddc_gmbus_pin;
                         DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin);
-                        if (bus_pin >= 1 && bus_pin <= 6)
+                        if (intel_gmbus_is_port_valid(bus_pin))
                                 dev_priv->crt_ddc_pin = bus_pin;
                 } else {
                         DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n",
-                                  block_size);
+                                      block_size);
                 }
         }
 }