Commit a09d431f authored by Dave Airlie's avatar Dave Airlie

drm/radeon: fix load detect on rn50 with hardcoded EDIDs.

When the force changes went in back in 3.3.0, we ended up returning
disconnected in the !force case, and the connected in when forced,
as it hit the hardcoded check.

Fix it so all exits go via the hardcoded check and stop spurious
modesets on platforms with hardcoded EDIDs.

Reported-by: Evan McNabb (Red Hat)
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4e47e02d
...@@ -1000,6 +1000,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) ...@@ -1000,6 +1000,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
* cases the DVI port is actually a virtual KVM port connected to the service * cases the DVI port is actually a virtual KVM port connected to the service
* processor. * processor.
*/ */
out:
if ((!rdev->is_atom_bios) && if ((!rdev->is_atom_bios) &&
(ret == connector_status_disconnected) && (ret == connector_status_disconnected) &&
rdev->mode_info.bios_hardcoded_edid_size) { rdev->mode_info.bios_hardcoded_edid_size) {
...@@ -1007,7 +1008,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) ...@@ -1007,7 +1008,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
ret = connector_status_connected; ret = connector_status_connected;
} }
out:
/* updated in get modes as well since we need to know if it's analog or digital */ /* updated in get modes as well since we need to know if it's analog or digital */
radeon_connector_update_scratch_regs(connector, ret); radeon_connector_update_scratch_regs(connector, ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment