This is a note to let you know that I've just added the patch titled
drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
to the 2.6.36-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-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From c7a71fc761551dc8be8543f14a90d08cda4e77f9 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 17 Nov 2010 02:49:40 -0500
Subject: drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
From: Alex Deucher <[email protected]>
commit c7a71fc761551dc8be8543f14a90d08cda4e77f9 upstream.
If there was no connector mapped to the encoder, atombios_get_encoder_mode()
returned 0 which is the id for DP. Return something sane instead based on
the encoder id. This avoids hitting the DP paths on non-DP encoders.
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_encoders.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -595,6 +595,7 @@ atombios_digital_setup(struct drm_encode
int
atombios_get_encoder_mode(struct drm_encoder *encoder)
{
+ struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
struct drm_connector *connector;
@@ -602,9 +603,20 @@ atombios_get_encoder_mode(struct drm_enc
struct radeon_connector_atom_dig *dig_connector;
connector = radeon_get_connector_for_encoder(encoder);
- if (!connector)
- return 0;
-
+ if (!connector) {
+ switch (radeon_encoder->encoder_id) {
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+ case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
+ case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
+ return ATOM_ENCODER_MODE_DVI;
+ case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
+ case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
+ default:
+ return ATOM_ENCODER_MODE_CRT;
+ }
+ }
radeon_connector = to_radeon_connector(connector);
switch (connector->connector_type) {
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/drm-radeon-kms-fix-regression-in-rs4xx-i2c-setup.patch
queue-2.6.36/drm-radeon-kms-fix-i2c-pad-masks-on-rs4xx.patch
queue-2.6.36/drm-radeon-kms-fix-2d-tile-height-alignment-in-the-r600-cs-checker.patch
queue-2.6.36/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
queue-2.6.36/drm-radeon-kms-fix-resume-regression-for-some-r5xx-laptops.patch
queue-2.6.36/drm-radeon-kms-fix-thermal-sensor-reporting-on-rv6xx.patch
queue-2.6.36/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
queue-2.6.36/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
queue-2.6.36/drm-radeon-kms-register-an-i2c-adapter-name-for-the-dp-aux-bus.patch
queue-2.6.36/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
queue-2.6.36/drm-radeon-kms-properly-compute-group_size-on-6xx-7xx.patch
queue-2.6.36/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch
queue-2.6.36/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
queue-2.6.36/drm-radeon-kms-fix-typos-in-disabled-vbios-code.patch
queue-2.6.36/drm-radeon-kms-don-t-disable-shared-encoders-on-pre-dce3-display-blocks.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
