diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-09-10 16:31:13 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-10 21:44:15 -0400 |
commit | 705af9c7a8bcb9c8752a73be9ca356acb5c7688c (patch) | |
tree | e1e9ff430981f875d9f3fce81e39ec456fc13430 /drivers/gpu/drm/radeon/radeon_encoders.c | |
parent | a381287759b2b65e7de9fb35801c781cab016f10 (diff) |
drm/radeon/kms: pull in latest quirks and fixes from ddx
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_encoders.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 9ad20350118f..e274bb13866e 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
@@ -537,6 +537,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
537 | 537 | ||
538 | switch (connector->connector_type) { | 538 | switch (connector->connector_type) { |
539 | case DRM_MODE_CONNECTOR_DVII: | 539 | case DRM_MODE_CONNECTOR_DVII: |
540 | case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */ | ||
540 | if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr)) | 541 | if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr)) |
541 | return ATOM_ENCODER_MODE_HDMI; | 542 | return ATOM_ENCODER_MODE_HDMI; |
542 | else if (radeon_connector->use_digital) | 543 | else if (radeon_connector->use_digital) |
@@ -546,7 +547,6 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) | |||
546 | break; | 547 | break; |
547 | case DRM_MODE_CONNECTOR_DVID: | 548 | case DRM_MODE_CONNECTOR_DVID: |
548 | case DRM_MODE_CONNECTOR_HDMIA: | 549 | case DRM_MODE_CONNECTOR_HDMIA: |
549 | case DRM_MODE_CONNECTOR_HDMIB: | ||
550 | default: | 550 | default: |
551 | if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr)) | 551 | if (drm_detect_hdmi_monitor((struct edid *)connector->edid_blob_ptr)) |
552 | return ATOM_ENCODER_MODE_HDMI; | 552 | return ATOM_ENCODER_MODE_HDMI; |