This is a note to let you know that I've just added the patch titled
drm/radeon/kms: adjust quirk for acer laptop
to the 2.6.37-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-kms-adjust-quirk-for-acer-laptop.patch
and it can be found in the queue-2.6.37 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 2f299d5de02da3ffb1f9e1a05c91dcd1173ebd3c Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 4 Jan 2011 17:42:20 -0500
Subject: drm/radeon/kms: adjust quirk for acer laptop
From: Alex Deucher <[email protected]>
commit 2f299d5de02da3ffb1f9e1a05c91dcd1173ebd3c upstream.
Acer laptop (TravelMate 5730G) has an HDMI connector
on the laptop and a DVI connector on the docking station
and both share the same encoder, hpd pin, and ddc line.
The bios connector table reflects this and is technically
correct, however, we drop the DVI connector here since
xrandr has no concept of encoders (only crtcs and connectors)
and will try and drive both connectors with different crtcs
which isn't possible on the hardware side and leaves no crtcs
for LVDS or VGA.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=32732
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/radeon_atombios.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -313,7 +313,6 @@ static bool radeon_atom_apply_quirks(str
uint16_t *line_mux,
struct radeon_hpd *hpd)
{
- struct radeon_device *rdev = dev->dev_private;
/* Asus M2A-VM HDMI board lists the DVI port as HDMI */
if ((dev->pdev->device == 0x791e) &&
@@ -436,21 +435,23 @@ static bool radeon_atom_apply_quirks(str
}
}
- /* Acer laptop reports DVI-D as DVI-I and hpd pins reversed */
+ /* Acer laptop (Acer TravelMate 5730G) has an HDMI port
+ * on the laptop and a DVI port on the docking station and
+ * both share the same encoder, hpd pin, and ddc line.
+ * So while the bios table is technically correct,
+ * we drop the DVI port here since xrandr has no concept of
+ * encoders and will try and drive both connectors
+ * with different crtcs which isn't possible on the hardware
+ * side and leaves no crtcs for LVDS or VGA.
+ */
if ((dev->pdev->device == 0x95c4) &&
(dev->pdev->subsystem_vendor == 0x1025) &&
(dev->pdev->subsystem_device == 0x013c)) {
- struct radeon_gpio_rec gpio;
-
if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&
(supported_device == ATOM_DEVICE_DFP1_SUPPORT)) {
- gpio = radeon_lookup_gpio(rdev, 6);
- *hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio);
+ /* actually it's a DVI-D port not DVI-I */
*connector_type = DRM_MODE_CONNECTOR_DVID;
- } else if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) &&
- (supported_device == ATOM_DEVICE_DFP1_SUPPORT)) {
- gpio = radeon_lookup_gpio(rdev, 7);
- *hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio);
+ return false;
}
}
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.37/drm-radeon-kms-fix-s-r-issues-with-bios-scratch-regs.patch
queue-2.6.37/drm-radeon-remove-0x4243-pci-id.patch
queue-2.6.37/drm-radeon-kms-switch-back-to-min-max-pll-post-divider-iteration.patch
queue-2.6.37/drm-radeon-kms-add-new-pll-algo-for-avivo-asics.patch
queue-2.6.37/drm-radeon-kms-add-pll-debugging-output.patch
queue-2.6.37/drm-radeon-kms-enable-new-pll-calculation-for-avivo-asics.patch
queue-2.6.37/drm-radeon-kms-evergreen-always-set-certain-vgt-regs-at-cp-init.patch
queue-2.6.37/drm-radeon-kms-adjust-quirk-for-acer-laptop.patch
queue-2.6.37/drm-radeon-kms-make-the-mac-rv630-quirk-generic.patch
queue-2.6.37/drm-radeon-kms-re-emit-full-context-state-for-evergreen-blits.patch
queue-2.6.37/drm-radeon-kms-add-quirk-for-mac-radeon-hd-2600-card.patch
queue-2.6.37/radeon-kms-fix-dp-displayport-mode-validation.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
