From 9b10361316f97fe853b58ce82a1ccf3dd92a20f3 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 13 Sep 2012 12:01:48 -0400 Subject: [PATCH] --- yaml --- r: 329569 b: refs/heads/master c: a59fbb8e18566a346a2736000d979576ab7525fe h: refs/heads/master i: 329567: 7765a226da94a54d9a070a5d12592f980d3f1fbb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/atombios_encoders.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 55be53b2f3a8..db605b058b8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e729586e33593cd11112ff22fa8f0e801af05b4e +refs/heads/master: a59fbb8e18566a346a2736000d979576ab7525fe diff --git a/trunk/drivers/gpu/drm/radeon/atombios_encoders.c b/trunk/drivers/gpu/drm/radeon/atombios_encoders.c index 784f6e784604..266036b10fec 100644 --- a/trunk/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/trunk/drivers/gpu/drm/radeon/atombios_encoders.c @@ -662,7 +662,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) return ATOM_ENCODER_MODE_DP; /* DVO is always DVO */ - if (radeon_encoder->encoder_id == ATOM_ENCODER_MODE_DVO) + if ((radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DVO1) || + (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1)) return ATOM_ENCODER_MODE_DVO; connector = radeon_get_connector_for_encoder(encoder);