drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()

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 <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Alex Deucher and committed by
Dave Airlie
c7a71fc7 ba251bde

+15 -3
+15 -3
drivers/gpu/drm/radeon/radeon_encoders.c
··· 595 595 int 596 596 atombios_get_encoder_mode(struct drm_encoder *encoder) 597 597 { 598 + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); 598 599 struct drm_device *dev = encoder->dev; 599 600 struct radeon_device *rdev = dev->dev_private; 600 601 struct drm_connector *connector; ··· 603 602 struct radeon_connector_atom_dig *dig_connector; 604 603 605 604 connector = radeon_get_connector_for_encoder(encoder); 606 - if (!connector) 607 - return 0; 608 - 605 + if (!connector) { 606 + switch (radeon_encoder->encoder_id) { 607 + case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: 608 + case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: 609 + case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: 610 + case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: 611 + case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1: 612 + return ATOM_ENCODER_MODE_DVI; 613 + case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1: 614 + case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2: 615 + default: 616 + return ATOM_ENCODER_MODE_CRT; 617 + } 618 + } 609 619 radeon_connector = to_radeon_connector(connector); 610 620 611 621 switch (connector->connector_type) {