This is a note to let you know that I've just added the patch titled drm/radeon: fix load detect on rn50 with hardcoded EDIDs. to the 3.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-radeon-fix-load-detect-on-rn50-with-hardcoded-edids.patch and it can be found in the queue-3.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a09d431f344d854e4fe9cfac44f78cb8202f3eb7 Mon Sep 17 00:00:00 2001 From: Dave Airlie <airlied@xxxxxxxxxx> Date: Thu, 19 Apr 2012 15:42:58 +0100 Subject: drm/radeon: fix load detect on rn50 with hardcoded EDIDs. From: Dave Airlie <airlied@xxxxxxxxxx> commit a09d431f344d854e4fe9cfac44f78cb8202f3eb7 upstream. 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 <alexander.deucher@xxxxxxx> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -976,6 +976,7 @@ radeon_dvi_detect(struct drm_connector * * cases the DVI port is actually a virtual KVM port connected to the service * processor. */ +out: if ((!rdev->is_atom_bios) && (ret == connector_status_disconnected) && rdev->mode_info.bios_hardcoded_edid_size) { @@ -983,7 +984,6 @@ radeon_dvi_detect(struct drm_connector * 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); return ret; Patches currently in stable-queue which might be from airlied@xxxxxxxxxx are queue-3.2/drm-radeon-kms-fix-the-regression-of-dvi-connector-check.patch queue-3.2/drm-radeon-fix-load-detect-on-rn50-with-hardcoded-edids.patch queue-3.2/drm-radeon-kms-fix-dvo-setup-on-some-r4xx-chips.patch queue-3.2/drm-radeon-disable-msi-on-rv515.patch queue-3.2/drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch -- To unsubscribe from this list: send the line "unsubscribe stable-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html