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

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

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

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)
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_connectors.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index aa8268d..3c2e7a0 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -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
 	 * processor.
 	 */
+out:
 	if ((!rdev->is_atom_bios) &&
 	    (ret == connector_status_disconnected) &&
 	    rdev->mode_info.bios_hardcoded_edid_size) {
@@ -1007,7 +1008,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
 		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;
-- 
1.7.7.6

Re: [PATCH] drm/radeon: fix load detect on rn50 with hardcoded EDIDs.

[Alex Deucher]

On Thu, Apr 19, 2012 at 10:45 AM, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> 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)
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Should probably cc stable as well.

> ---
>  drivers/gpu/drm/radeon/radeon_connectors.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> index aa8268d..3c2e7a0 100644
> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> @@ -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
>         * processor.
>         */
> +out:
>        if ((!rdev->is_atom_bios) &&
>            (ret == connector_status_disconnected) &&
>            rdev->mode_info.bios_hardcoded_edid_size) {
> @@ -1007,7 +1008,6 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
>                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;
> --
> 1.7.7.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel