From patchwork Mon Nov 21 19:39:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manoj Iyer X-Patchwork-Id: 126910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 43776B7205 for ; Tue, 22 Nov 2011 06:39:24 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RSZhx-0002ph-BX; Mon, 21 Nov 2011 19:39:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RSZhr-0002pZ-NC for kernel-team@lists.ubuntu.com; Mon, 21 Nov 2011 19:39:07 +0000 Received: from cpe-70-112-75-115.austin.res.rr.com ([70.112.75.115] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RSZhr-0008Cf-DF for kernel-team@lists.ubuntu.com; Mon, 21 Nov 2011 19:39:07 +0000 From: Manoj Iyer To: kernel-team@lists.ubuntu.com Subject: [Oneiric SRU] UBUNTU: SAUCE: drm/i915: add multi-threaded forcewake support Date: Mon, 21 Nov 2011 13:39:05 -0600 Message-Id: <1321904345-7466-1-git-send-email-manoj.iyer@canonical.com> X-Mailer: git-send-email 1.7.5.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Please consider this Sauce patch for Oneiric. SRU JUSTIFICATION ================ ISSUE ===== Ivybridge system fails to resume from S3/S4 with recent BIOS. On system resume causes kernel oops in i915 driver. FIX === Upstream fixed the issue by adding multi-threaded forcewake support. On IVB C0+ with newer BIOSes, the forcewake handshake has changed. There's now a bitfield for different driver components to keep the GT powered on. On Linux, we centralize forcewake handling in one place, so we still just need a single bit, but we need to use the new registers if MT forcewake is enabled. TEST ===== This patch was tested on Ivybridge system with the kernel posted at http://kernel.ubuntu.com/~sarvatt/fdo42923/ and the test results are noted in comment #3 in this bug, and also reported the same to https://bugs.freedesktop.org/show_bug.cgi?id=42923 The following changes since commit b81353472fcf931e4e0812b5cb42674d029d5ffc: drm/i915: add multi-threaded forcewake support (2011-11-21 13:32:38 -0600) are available in the git repository at: git://kernel.ubuntu.com/manjo/ubuntu-oneiric.git lp891270v2 Keith Packard (1): drm/i915: add multi-threaded forcewake support drivers/gpu/drm/i915/i915_drv.c | 30 ++++++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++++++++++++ 4 files changed, 60 insertions(+), 4 deletions(-)