[APPLIED] [PATCH 0/5] [Maverick] SRU: Restore video from S3 resume on Sandybridge

[Brad Figg]

On 10/19/2010 12:03 PM, Colin King wrote:
> From: Colin Ian King<colin.king at canonical.com>
>
> BugLink: http://launchpad.net/bugs/663442
>
> 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(-)
>
>

Applied to Maverick master.

-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com