6 files changed, 56 insertions, 12 deletions

diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 3cd3234ba0a..10e41af6b02 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -957,7 +957,11 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
         /* adjust pixel clock as needed */
         adjusted_clock = atombios_adjust_pll(crtc, mode, pll, ss_enabled, &ss);
 
-        if (ASIC_IS_AVIVO(rdev))
+        if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
+                /* TV seems to prefer the legacy algo on some boards */
+                radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
+                                          &ref_div, &post_div);
+        else if (ASIC_IS_AVIVO(rdev))
                 radeon_compute_pll_avivo(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
                                          &ref_div, &post_div);
         else
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index cf7c8d5b4ec..cf602e2d071 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -448,7 +448,7 @@ static uint16_t combios_get_table_offset(struct drm_device *dev,
 
 bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)
 {
-        int edid_info;
+        int edid_info, size;
         struct edid *edid;
         unsigned char *raw;
         edid_info = combios_get_table_offset(rdev->ddev, COMBIOS_HARDCODED_EDID_TABLE);
@@ -456,11 +456,12 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)
                 return false;
 
         raw = rdev->bios + edid_info;
-        edid = kmalloc(EDID_LENGTH * (raw[0x7e] + 1), GFP_KERNEL);
+        size = EDID_LENGTH * (raw[0x7e] + 1);
+        edid = kmalloc(size, GFP_KERNEL);
         if (edid == NULL)
                 return false;
 
-        memcpy((unsigned char *)edid, raw, EDID_LENGTH * (raw[0x7e] + 1));
+        memcpy((unsigned char *)edid, raw, size);
 
         if (!drm_edid_is_valid(edid)) {
                 kfree(edid);
@@ -468,6 +469,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)
         }
 
         rdev->mode_info.bios_hardcoded_edid = edid;
+        rdev->mode_info.bios_hardcoded_edid_size = size;
         return true;
 }
 
@@ -475,8 +477,17 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)
 struct edid *
 radeon_bios_get_hardcoded_edid(struct radeon_device *rdev)
 {
-        if (rdev->mode_info.bios_hardcoded_edid)
-                return rdev->mode_info.bios_hardcoded_edid;
+        struct edid *edid;
+
+        if (rdev->mode_info.bios_hardcoded_edid) {
+                edid = kmalloc(rdev->mode_info.bios_hardcoded_edid_size, GFP_KERNEL);
+                if (edid) {
+                        memcpy((unsigned char *)edid,
+                               (unsigned char *)rdev->mode_info.bios_hardcoded_edid,
+                               rdev->mode_info.bios_hardcoded_edid_size);
+                        return edid;
+                }
+        }
         return NULL;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 28c7961cd19..2ef6d513506 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -633,6 +633,8 @@ static int radeon_vga_mode_valid(struct drm_connector *connector,
 static enum drm_connector_status
 radeon_vga_detect(struct drm_connector *connector, bool force)
 {
+        struct drm_device *dev = connector->dev;
+        struct radeon_device *rdev = dev->dev_private;
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         struct drm_encoder *encoder;
         struct drm_encoder_helper_funcs *encoder_funcs;
@@ -683,6 +685,17 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
 
         if (ret == connector_status_connected)
                 ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true);
+
+        /* RN50 and some RV100 asics in servers often have a hardcoded EDID in the
+         * vbios to deal with KVMs. If we have one and are not able to detect a monitor
+         * by other means, assume the CRT is connected and use that EDID.
+         */
+        if ((!rdev->is_atom_bios) &&
+            (ret == connector_status_disconnected) &&
+            rdev->mode_info.bios_hardcoded_edid_size) {
+                ret = connector_status_connected;
+        }
+
         radeon_connector_update_scratch_regs(connector, ret);
         return ret;
 }
@@ -794,6 +807,8 @@ static int radeon_dvi_get_modes(struct drm_connector *connector)
 static enum drm_connector_status
 radeon_dvi_detect(struct drm_connector *connector, bool force)
 {
+        struct drm_device *dev = connector->dev;
+        struct radeon_device *rdev = dev->dev_private;
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         struct drm_encoder *encoder = NULL;
         struct drm_encoder_helper_funcs *encoder_funcs;
@@ -833,8 +848,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
                          * you don't really know what's connected to which port as both are digital.
                          */
                         if (radeon_connector->shared_ddc && (ret == connector_status_connected)) {
-                                struct drm_device *dev = connector->dev;
-                                struct radeon_device *rdev = dev->dev_private;
                                 struct drm_connector *list_connector;
                                 struct radeon_connector *list_radeon_connector;
                                 list_for_each_entry(list_connector, &dev->mode_config.connector_list, head) {
@@ -899,6 +912,19 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
                 ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true);
         }
 
+        /* RN50 and some RV100 asics in servers often have a hardcoded EDID in the
+         * vbios to deal with KVMs. If we have one and are not able to detect a monitor
+         * by other means, assume the DFP is connected and use that EDID.  In most
+         * cases the DVI port is actually a virtual KVM port connected to the service
+         * processor.
+         */
+        if ((!rdev->is_atom_bios) &&
+            (ret == connector_status_disconnected) &&
+            rdev->mode_info.bios_hardcoded_edid_size) {
+                radeon_connector->use_digital = true;
+                ret = connector_status_connected;
+        }
+
 out:
         /* updated in get modes as well since we need to know if it's analog or digital */
         radeon_connector_update_scratch_regs(connector, ret);
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index 66c9af1b3d9..41a5d48e657 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -889,7 +889,7 @@ static void radeon_set_pll(struct drm_crtc *crtc, struct drm_display_mode *mode)
                 }
 
                 if (rdev->flags & RADEON_IS_MOBILITY) {
-                        /* A temporal workaround for the occational blanking on certain laptop panels.
+                        /* A temporal workaround for the occasional blanking on certain laptop panels.
                            This appears to related to the PLL divider registers (fail to lock?).
                            It occurs even when all dividers are the same with their old settings.
                            In this case we really don't need to fiddle with PLL registers.
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index e4582814bb7..9c57538231d 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -239,6 +239,7 @@ struct radeon_mode_info {
         struct drm_property *underscan_vborder_property;
         /* hardcoded DFP edid from BIOS */
         struct edid *bios_hardcoded_edid;
+        int bios_hardcoded_edid_size;
 
         /* pointer to fbdev info structure */
         struct radeon_fbdev *rfbdev;
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 2aed03bde4b..08de669e025 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -365,12 +365,14 @@ static ssize_t radeon_set_pm_profile(struct device *dev,
                 else if (strncmp("high", buf, strlen("high")) == 0)
                         rdev->pm.profile = PM_PROFILE_HIGH;
                 else {
-                        DRM_ERROR("invalid power profile!\n");
+                        count = -EINVAL;
                         goto fail;
                 }
                 radeon_pm_update_profile(rdev);
                 radeon_pm_set_clocks(rdev);
-        }
+        } else
+                count = -EINVAL;
+
 fail:
         mutex_unlock(&rdev->pm.mutex);
 
@@ -413,7 +415,7 @@ static ssize_t radeon_set_pm_method(struct device *dev,
                 mutex_unlock(&rdev->pm.mutex);
                 cancel_delayed_work_sync(&rdev->pm.dynpm_idle_work);
         } else {
-                DRM_ERROR("invalid power method!\n");
+                count = -EINVAL;
                 goto fail;
         }
         radeon_pm_compute_clocks(rdev);