On 27.04.2012 23:18, alexdeucher@gmail.com wrote:

From: Alex Deucheralexander.deucher@amd.com

Makes Nutmeg DP to VGA bridges work for me.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=42490

Noticed by Jerome Glisse

Signed-off-by: Alex Deucheralexander.deucher@amd.com Cc: stable@vger.kernel.org

---

drivers/gpu/drm/radeon/atombios_crtc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index c5c31e0..af1054f 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -958,8 +958,8 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode break; }

• if (radeon_encoder->active_device&

•    (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) {
  

• if ((radeon_encoder->active_device& (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||

•    (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {
  

  struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

Also gets the NUTMEG bridge on my llano board working, but DP on trinity is still problematic. Anyway:

Tested-by: Christian König deathsimple@vodafone.de