From patchwork Wed Apr 1 18:53:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 15730 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n31IrdEJ008183 for ; Wed, 1 Apr 2009 18:53:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761946AbZDASxj (ORCPT ); Wed, 1 Apr 2009 14:53:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765631AbZDASxj (ORCPT ); Wed, 1 Apr 2009 14:53:39 -0400 Received: from cavan.codon.org.uk ([93.93.128.6]:51012 "EHLO vavatch.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761946AbZDASxi (ORCPT ); Wed, 1 Apr 2009 14:53:38 -0400 Received: from mjg59 by vavatch.codon.org.uk with local (Exim 4.69) (envelope-from ) id 1Lp5Z7-0004Bw-Go; Wed, 01 Apr 2009 19:53:33 +0100 Date: Wed, 1 Apr 2009 19:53:33 +0100 From: Matthew Garrett To: intel-gfx@lists.freedesktop.org Cc: linux-acpi@vger.kernel.org, Len Brown Subject: [PATCH 2/2] i915: Enable ASLE if present Message-ID: <20090401185333.GB16067@srcf.ucam.org> References: <20090401185229.GA16067@srcf.ucam.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090401185229.GA16067@srcf.ucam.org> User-Agent: Mutt/1.5.12-2006-07-14 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: mjg59@codon.org.uk X-SA-Exim-Scanned: No (on vavatch.codon.org.uk); SAEximRunCond expanded to false Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The changes to opregion initialisation order meant that the ASLE setup code might not be run at the correct time. Ensure that the interrupts are set up. Signed-off-by: Matthew Garrett --- drivers/gpu/drm/i915/i915_opregion.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index c63256b..3699a16 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c @@ -389,6 +389,7 @@ int intel_opregion_init(struct drm_device *dev, int resume) if (mboxes & MBOX_ASLE) { DRM_DEBUG("ASLE supported\n"); opregion->asle = base + OPREGION_ASLE_OFFSET; + opregion_enable_asle(dev); } /* Notify BIOS we are ready to handle ACPI video ext notifs.