mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ike Panhc <ike.pan@canonical.com>
To: stable@kernel.org
Cc: linux-kernel@vger.kernel.org, David Airlie <airlied@linux.ie>,
	Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH] [Stable] agp/intel: complete the enablement for B43.1
Date: Fri, 12 Nov 2010 17:57:23 +0800	[thread overview]
Message-ID: <1289555843-6425-1-git-send-email-ike.pan@canonical.com> (raw)

This patch completes the missing part of commit 41a514 and 3dde04b and I think
commit 3dde04b is already in queue for next stable release.

Thanks Chris Wilson has the patch for enabling Intel B43.1 and backports it to
stable kernel. On mainline commit 210b23 and 1a997ff the way to detect gtt size
is changed, but these two commits landed on mainline kernel after .36 kernel
released. So that mainline kernel works fine on B43.1 machine but not stable
kernel.

Without this patch, X fails to start on 2.6.35.y kernel. After patched, X
starts.

This patch is made for 2.6.35.y and I believe it suits for 2.6.36.y.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
 drivers/char/agp/intel-agp.h |    1 +
 drivers/char/agp/intel-gtt.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index bc9a4ad..cdefd47 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -241,6 +241,7 @@
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_HB || \
+		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_B43_1_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB || \
 		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB || \
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index ed11c77..c35361c 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1338,6 +1338,7 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)
 	case PCI_DEVICE_ID_INTEL_G45_HB:
 	case PCI_DEVICE_ID_INTEL_G41_HB:
 	case PCI_DEVICE_ID_INTEL_B43_HB:
+	case PCI_DEVICE_ID_INTEL_B43_1_HB:
 	case PCI_DEVICE_ID_INTEL_IRONLAKE_D_HB:
 	case PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB:
 	case PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB:
-- 
1.7.1


             reply	other threads:[~2010-11-12  9:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-12  9:57 Ike Panhc [this message]
2010-11-12 10:07 ` Chris Wilson
2010-12-03 22:52 ` [stable] " Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289555843-6425-1-git-send-email-ike.pan@canonical.com \
    --to=ike.pan@canonical.com \
    --cc=airlied@linux.ie \
    --cc=chris@chris-wilson.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®