Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...

* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
  drm/nouveau: fix suspend/resume on GPUs that don't have PM support
  drm/nouveau: flips/flipd need to always set 'evict' for move_accel_cleanup()
  drm/nv40: fix tiling-related setup for a number of chipsets
  drm/nouveau: fix non-EDIDful native mode selection
  drm/nouveau: Fix detection of DDC-based LVDS on DCB15 boards.
  drm/nv04-nv40: Fix NULL dereference when we fail to find an LVDS native mode.
  drm/nv10: Fix crash when allocating a BO larger than half the available VRAM.

diff --combined drivers/gpu/drm/nouveau/nouveau_bios.c
index 49e5e99,6faf3cf..6bdab89
--- 1/drivers/gpu/drm/nouveau/nouveau_bios.c
--- 2/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@@ -1927,7 -1927,7 +1927,7 @@@ init_ltime(struct nvbios *bios, uint16_
         * offset      (8  bit): opcode
         * offset + 1  (16 bit): time
         *
 -       * Sleep for "time" miliseconds.
 +       * Sleep for "time" milliseconds.
         */
  
        unsigned time = ROM16(bios->data[offset + 1]);
@@@ -1935,7 -1935,7 +1935,7 @@@
        if (!iexec->execute)
                return 3;
  
 -      BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X miliseconds\n",
 +      BIOSLOG(bios, "0x%04X: Sleeping for 0x%04X milliseconds\n",
                offset, time);
  
        msleep(time);
@@@ -6228,7 -6228,7 +6228,7 @@@ parse_dcb15_entry(struct drm_device *de
                entry->tvconf.has_component_output = false;
                break;
        case OUTPUT_LVDS:
-               if ((conn & 0x00003f00) != 0x10)
+               if ((conn & 0x00003f00) >> 8 != 0x10)
                        entry->lvdsconf.use_straps_for_mode = true;
                entry->lvdsconf.use_power_scripts = true;
                break;