From patchwork Tue Mar 30 17:46:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Conklin X-Patchwork-Id: 49002 X-Patchwork-Delegate: apw@canonical.com 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 D9B51B7CB6 for ; Wed, 31 Mar 2010 04:47:07 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NwfWn-0002We-Ve; Tue, 30 Mar 2010 18:47:02 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NwfWm-0002W0-1y for kernel-team@lists.ubuntu.com; Tue, 30 Mar 2010 18:47:00 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NwfWm-0007JB-0K for ; Tue, 30 Mar 2010 18:47:00 +0100 Received: from ip-64-32-163-20.atl.megapath.net ([64.32.163.20] helo=[172.31.0.105]) by hutte.canonical.com with esmtpsa (SSL 3.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NwfWl-0004lE-L0 for kernel-team@lists.ubuntu.com; Tue, 30 Mar 2010 18:46:59 +0100 Subject: [PATCH] UBUNTU: SAUCE: drm/i915: Disable FBC on 915GM and 945GM From: Steve Conklin To: Ubuntu Kernel Team Date: Tue, 30 Mar 2010 12:46:57 -0500 Message-ID: <1269971217.2176.227.camel@xps-1> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Patch is attached (At the moment I have only broken mailers working which munge patches) Patch has been accepted by upstream but isn't in Linus's tree yet. Steve Acked-by: Andy Whitcroft Acked-by: Stefan Bader From f41026f152469afd0f708030e259e057986b693f Mon Sep 17 00:00:00 2001 From: Steve Conklin Date: Mon, 29 Mar 2010 14:45:40 -0500 Subject: [PATCH] UBUNTU: SAUCE: drm/i915: Disable FBC on 915GM and 945GM 945 class Intel hardware has several problems related to FBC. These are prevented by disabling it on these devices. This patch has been accepted by upstream but has not made it into Linus's tree yet. BugLink: http://bugs.launchpad.net/bugs/492392 Signed-off-by: Robert Hooker Signed-off-by: Steve Conklin --- drivers/gpu/drm/i915/i915_drv.c | 4 ++-- drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index cf4cb3e..4746bfe 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -79,14 +79,14 @@ const static struct intel_device_info intel_i915g_info = { .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1, }; const static struct intel_device_info intel_i915gm_info = { - .is_i9xx = 1, .is_mobile = 1, .has_fbc = 1, + .is_i9xx = 1, .is_mobile = 1, .cursor_needs_physical = 1, }; const static struct intel_device_info intel_i945g_info = { .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1, }; const static struct intel_device_info intel_i945gm_info = { - .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, .has_fbc = 1, + .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, .has_hotplug = 1, .cursor_needs_physical = 1, }; diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b27202d..0d4c401 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4683,7 +4683,7 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.fbc_enabled = g4x_fbc_enabled; dev_priv->display.enable_fbc = g4x_enable_fbc; dev_priv->display.disable_fbc = g4x_disable_fbc; - } else if (IS_I965GM(dev) || IS_I945GM(dev) || IS_I915GM(dev)) { + } else if (IS_I965GM(dev)) { dev_priv->display.fbc_enabled = i8xx_fbc_enabled; dev_priv->display.enable_fbc = i8xx_enable_fbc; dev_priv->display.disable_fbc = i8xx_disable_fbc; -- 1.6.3.3