S3 resume fails to restore video on Intel Sandybridge platforms

[Colin Ian King]

Video fails to restore (blank laptop monitor) from resume from S3 on Intel Sandybridge platforms.

SRU Justification:

Impact: Resuming from S3 on Sandybridge laptops results in a blank display and no video.

Fix: Attached 5 patches restore fence registers correctly, align the display surface so to avoid tiling corruption and correctly check for sandybrige chipset in resume path.

Testcase: Without the patches, resume from S3 results in a blank display with no video being displayed. With the patches, S3 can be run multiple times and video is restored correctly on each resume.

Chris Wilson (5):
  drm/i915: Silence sparse over duplicate members in static initializer
  drm/i915: Use 128k alignment for untiled display surface on i965 (v2)
  drm/i915: Include a generation number in the device info
  drm/i915: Fix Sandybridge fence registers
  drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/

 drivers/gpu/drm/i915/i915_drv.c | 61 +++++++++-----------
 drivers/gpu/drm/i915/i915_drv.h | 31 +++-------
 drivers/gpu/drm/i915/i915_gem.c | 37 ++++++++----
 drivers/gpu/drm/i915/i915_suspend.c | 106 ++++++++++++++++++++--------------
 drivers/gpu/drm/i915/intel_display.c | 7 ++-
 5 files changed, 130 insertions(+), 112 deletions(-)

[Leann Ogasawara (leannogasawara)]

Looks like the patches have been applied to the Maverick linux master branch. Marking this Fix Committed.

[Chris Van Hoof (vanhoof)]

We've tested the current pre-proposed kernel on 7 different sandybridge based machines and resume from s3 and s4 is working properly ... Will take another pass on these boxes once the kernel lands in -proposed

[Martin Pitt (pitti)]

Accepted linux into maverick-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

[Chris Van Hoof (vanhoof)]

We have tested the current -proposed kernel (.36) on seven individual SandyBridge platforms. In each case, s3 and s4 are functioning properly.

--chris

[Chris Van Hoof (vanhoof)]

Just another note, this was Maverick _fully_ updated

[Robert Hooker (sarvatt)]

Indeed, I just tested it on a sandybridge machine and it now suspends and resumes fine, thanks!

[Robert Hooker (sarvatt)]

Wanted to note its still fixed in the latest version in -proposed.

[Launchpad Janitor (janitor)]

This bug was fixed in the package linux - 2.6.35-23.40

---------------
linux (2.6.35-23.40) maverick-proposed; urgency=low

  [ Brad Figg ]

  * No change rebuild.

linux (2.6.35-23.39) maverick-proposed; urgency=low

  [ Brad Figg ]
    - LP: #676214

  [ Ricardo Salveti de Araujo ]

  * SAUCE: ARM: OMAP3: beagle: use GPIO2 on the xM A3 to turn DVI on
    - LP: #663642

linux (2.6.35-23.38) maverick-proposed; urgency=low

  [ Brad Figg ]

  * Revert "SAUCE: ARM: OMAP3: beagle: use GPIO2 on the xM A3 to turn DVI
    on"

  [ Upstream Kernel Changes ]

  * Revert "(upstream) ALSA: hda - Apply ALC269 VAIO fix-up to all Sony
    laptops with ALC269"
  * Revert "ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA
    controllers"
  * Buglink Fixup for reverted unverified fixes

linux (2.6.35-23.37) maverick-proposed; urgency=low

  [ Brad Figg ]

  * ARM: Temporarily disable module check for armel

linux (2.6.35-23.36) maverick-proposed; urgency=low

  [ Andy Whitcroft ]

  * reduce disk usage during buildd builds
    - LP: #645653

  [ Brad Figg ]

  * ARM: Temporarily disable module check for armel

  [ Enric Balletbo i Serra ]

  * ARM: igepv2: Adding support for VBUS and overcurrent
    - LP: #651589
  * ARM: igepv2: Fix and improve LED handling
    - LP: #654582
  * ARM: igepv2: Introduce function to dectect HW version
    - LP: #654586
  * ARM: igepv2: Fix handling of GPIOs for WLAN-BT combo
    - LP: #654590
  * ARM: igepv2: Add i2c eeprom driver to read EDID
    - LP: #654594
  * ARM: igepv2: Remove VMMC2 regulator
    - LP: #654595

  [ Leann Ogasawara ]

  * ARM: Temporarily disable module check for armel

  [ Mathieu Poirier ]

  * SAUCE: ARM: Add DSS2 support for Overo board
    - LP: #660811

  [ Maurus Cuelenaere ]

  * SAUCE: ARM: OMAP3: Add S-Video output to IGEPv2 board
    - LP: #607250

  [ Ricardo Salveti de Araujo ]

  * [Config] Remove CONFIG_FIXED_PHY and move CONFIG_SMSC911X from m to y
    for omap
    - LP: #645689
  * SAUCE: ARM: OMAP3: Adding vdd_sdi regulator supply to IGEPv2 board
    - LP: #607250
  * SAUCE: ARM: OMAP3: beagle: use GPIO2 on the xM A3 to turn DVI on
    - See: #663642

  [ Upstream Kernel Changes ]

  * Revert "(pre-stable) ALSA: HDA: Use model=auto for LG R510"
  * Revert "(pre-stable) ALSA: hda - Rename iMic to Int Mic on Lenovo
    NB0763"
  * Revert "Input: appletouch - fix integer overflow issue"
  * Revert "ALSA: hda - Handle pin NID 0x1a on ALC259/269"
  * Revert "ALSA: hda - Handle missing NID 0x1b on ALC259 codec"
  * Revert "(pre-stable) ALSA: hda - Add a new hp-laptop model for Conexant
    5066, tested on HP G60"
  * Revert "mmc: build fix: mmc_pm_notify is only available with
    CONFIG_PM=y"
  * Revert "mmc: fix all hangs related to mmc/sd card insert/removal during
    suspend/resume"
  * Revert "(pre-stable) bounce: call flush_dcache_page() after
    bounce_copy_vec()"
  * Revert "Input: i8042 - reset keyboard controller wehen resuming from
    S2R"
  * Revert "ALSA: HDA: Enable internal speaker on Dell M101z"
  * Revert "(pre-stable) drm/i915: don't enable self-refresh on Ironlake"
  * Revert "drm/i915: Allow LVDS on pipe A on gen4+"
  * (pre-stable) ACPI: enable repeated...