This is a note to let you know that I've just added the patch titled
drm/radeon: fix dpms on/off on trinity/aruba v2
to the 3.5-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-fix-dpms-on-off-on-trinity-aruba-v2.patch
and it can be found in the queue-3.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From fcedac670c3da0d17aaa5db1708694971e8024a9 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <[email protected]>
Date: Tue, 24 Jul 2012 17:06:11 -0400
Subject: drm/radeon: fix dpms on/off on trinity/aruba v2
From: Jerome Glisse <[email protected]>
commit fcedac670c3da0d17aaa5db1708694971e8024a9 upstream.
The external encoder need to be setup again before enabling the
transmiter. This seems to be only needed on some trinity/aruba
to fix dpms on.
v2: Add comment, only setup again on dce6 ie aruba or newer.
Signed-off-by: Jerome Glisse <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/atombios_encoders.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1392,10 +1392,18 @@ radeon_atom_encoder_dpms_dig(struct drm_
case DRM_MODE_DPMS_ON:
/* some early dce3.2 boards have a bug in their transmitter
control table */
if ((rdev->family == CHIP_RV710) || (rdev->family ==
CHIP_RV730) ||
- ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev))
+ ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev)) {
+ if (ASIC_IS_DCE6(rdev)) {
+ /* It seems we need to call
ATOM_ENCODER_CMD_SETUP again
+ * before reenabling encoder on DPMS ON,
otherwise we never
+ * get picture
+ */
+ atombios_dig_encoder_setup(encoder,
ATOM_ENCODER_CMD_SETUP, 0);
+ }
atombios_dig_transmitter_setup(encoder,
ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
- else
+ } else {
atombios_dig_transmitter_setup(encoder,
ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
+ }
if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) &&
connector) {
if (connector->connector_type ==
DRM_MODE_CONNECTOR_eDP) {
atombios_set_edp_panel_power(connector,
Patches currently in stable-queue which might be from [email protected] are
queue-3.5/drm-radeon-fix-hotplug-of-dp-to-dvi-hdmi-passive-adapters-v2.patch
queue-3.5/drm-radeon-on-hotplug-force-link-training-to-happen-v2.patch
queue-3.5/drm-radeon-fix-bo-creation-retry-path.patch
queue-3.5/drm-radeon-fix-dpms-on-off-on-trinity-aruba-v2.patch
queue-3.5/drm-radeon-fix-non-revealent-error-message.patch
queue-3.5/drm-radeon-fix-fence-related-segfault-in-cs.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
