Skip to content

Commit a09d431

Browse files
committed
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: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
1 parent 4e47e02 commit a09d431

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/radeon/radeon_connectors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,14 +1000,14 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
10001000
* cases the DVI port is actually a virtual KVM port connected to the service
10011001
* processor.
10021002
*/
1003+
out:
10031004
if ((!rdev->is_atom_bios) &&
10041005
(ret == connector_status_disconnected) &&
10051006
rdev->mode_info.bios_hardcoded_edid_size) {
10061007
radeon_connector->use_digital = true;
10071008
ret = connector_status_connected;
10081009
}
10091010

1010-
out:
10111011
/* updated in get modes as well since we need to know if it's analog or digital */
10121012
radeon_connector_update_scratch_regs(connector, ret);
10131013
return ret;

0 commit comments

Comments
 (0)