aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_display.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 07ac48162a13..a22d6e6a49a2 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -33,8 +33,6 @@
33#include "drm_crtc_helper.h" 33#include "drm_crtc_helper.h"
34#include "drm_edid.h" 34#include "drm_edid.h"
35 35
36static int radeon_ddc_dump(struct drm_connector *connector);
37
38static void avivo_crtc_load_lut(struct drm_crtc *crtc) 36static void avivo_crtc_load_lut(struct drm_crtc *crtc)
39{ 37{
40 struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); 38 struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
@@ -669,7 +667,6 @@ static void radeon_print_display_setup(struct drm_device *dev)
669static bool radeon_setup_enc_conn(struct drm_device *dev) 667static bool radeon_setup_enc_conn(struct drm_device *dev)
670{ 668{
671 struct radeon_device *rdev = dev->dev_private; 669 struct radeon_device *rdev = dev->dev_private;
672 struct drm_connector *drm_connector;
673 bool ret = false; 670 bool ret = false;
674 671
675 if (rdev->bios) { 672 if (rdev->bios) {
@@ -689,8 +686,6 @@ static bool radeon_setup_enc_conn(struct drm_device *dev)
689 if (ret) { 686 if (ret) {
690 radeon_setup_encoder_clones(dev); 687 radeon_setup_encoder_clones(dev);
691 radeon_print_display_setup(dev); 688 radeon_print_display_setup(dev);
692 list_for_each_entry(drm_connector, &dev->mode_config.connector_list, head)
693 radeon_ddc_dump(drm_connector);
694 } 689 }
695 690
696 return ret; 691 return ret;
@@ -744,34 +739,6 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
744 return 0; 739 return 0;
745} 740}
746 741
747static int radeon_ddc_dump(struct drm_connector *connector)
748{
749 struct edid *edid;
750 struct radeon_connector *radeon_connector = to_radeon_connector(connector);
751 int ret = 0;
752
753 /* on hw with routers, select right port */
754 if (radeon_connector->router.ddc_valid)
755 radeon_router_select_ddc_port(radeon_connector);
756
757 if (!radeon_connector->ddc_bus)
758 return -1;
759 edid = drm_get_edid(connector, &radeon_connector->ddc_bus->adapter);
760 /* Log EDID retrieval status here. In particular with regard to
761 * connectors with requires_extended_probe flag set, that will prevent
762 * function radeon_dvi_detect() to fetch EDID on this connector,
763 * as long as there is no valid EDID header found */
764 if (edid) {
765 DRM_INFO("Radeon display connector %s: Found valid EDID",
766 drm_get_connector_name(connector));
767 kfree(edid);
768 } else {
769 DRM_INFO("Radeon display connector %s: No monitor connected or invalid EDID",
770 drm_get_connector_name(connector));
771 }
772 return ret;
773}
774
775/* avivo */ 742/* avivo */
776static void avivo_get_fb_div(struct radeon_pll *pll, 743static void avivo_get_fb_div(struct radeon_pll *pll,
777 u32 target_clock, 744 u32 target_clock,