From: Alex Deucher <alexdeucher@gmail.com>
To: airlied@gmail.com, dri-devel@lists.freedesktop.org
Cc: "Michel Dänzer" <michel@daenzer.net>,
"Joachim Henke" <j-o@users.sourceforge.net>
Subject: [PATCH] drm/radeon/kms: fix mac g5 quirk
Date: Mon, 6 Jun 2011 12:53:30 -0400 [thread overview]
Message-ID: <1307379210-9213-1-git-send-email-alexdeucher@gmail.com> (raw)
In-Reply-To: <4DD7F0F3.5060701@users.sourceforge.net>
Apple uses the same subsystem pci ids for lots of
hardware much of which is wired up differently. In
this case, the G5 imac and the G5 tower.
Only apply the quirk configuration to G5 towers.
Reported-by: Joachim Henke <j-o@users.sourceforge.net>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: Joachim Henke <j-o@users.sourceforge.net>
Cc: Michel Dänzer <michel@daenzer.net>
---
drivers/gpu/drm/radeon/radeon_combios.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 5b991f7..19b10cf 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -1548,9 +1548,8 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
(rdev->pdev->subsystem_device == 0x4a48)) {
/* Mac X800 */
rdev->mode_info.connector_table = CT_MAC_X800;
- } else if ((rdev->pdev->device == 0x4150) &&
- (rdev->pdev->subsystem_vendor == 0x1002) &&
- (rdev->pdev->subsystem_device == 0x4150)) {
+ } else if (of_machine_is_compatible("PowerMac7,2") ||
+ of_machine_is_compatible("PowerMac7,3")) {
/* Mac G5 9600 */
rdev->mode_info.connector_table = CT_MAC_G5_9600;
} else
--
1.7.1.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2011-06-06 16:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 12:21 [regression] blank screen with radeondrmfb on iMac G5 (ALS) Joachim Henke
2011-05-21 15:14 ` Alex Deucher
2011-05-21 16:02 ` Michel Dänzer
2011-05-21 17:05 ` Joachim Henke
2011-06-06 16:53 ` Alex Deucher [this message]
2011-06-14 6:39 ` [PATCH] drm/radeon/kms: fix mac g5 quirk Michel Dänzer
2011-06-14 6:48 ` Alex Deucher
2011-06-14 6:57 ` Michel Dänzer
2011-06-14 15:22 ` [PATCH] drm/radeon/kms: be more pendatic about the " Alex Deucher
2011-06-14 15:25 ` Michel Dänzer
2011-06-14 15:27 ` [PATCH] drm/radeon/kms: be more pedantic about the g5 quirk (v2) Alex Deucher
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=1307379210-9213-1-git-send-email-alexdeucher@gmail.com \
--to=alexdeucher@gmail.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=j-o@users.sourceforge.net \
--cc=michel@daenzer.net \
/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;
as well as URLs for NNTP newsgroup(s).