[PATCH] drm/radeon: fix XFX quirk

[Alex Deucher]

On Wed, May 23, 2012 at 11:48 AM,  <alexdeucher at gmail.com> wrote:
> From: Alex Deucher <alexander.deucher at amd.com>
>
> Only override the ddc bus if the connector doesn't have
> a valid one.  The existing code overrode the ddc bus for
> all connectors even if it had ddc bus.
>
> Fixes ddc on another XFX card with the same pci ids that
> was broken by the quirk overwriting the correct ddc bus.
>
> Reported-by: Mehdi Aqadjani Memar <m.aqadjanimemar at student.ru.nl>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

This should go to stable as well.

Cc: stable at vger.kernel.org

> ---
>  drivers/gpu/drm/radeon/radeon_atombios.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
> index f21cb08..3f57c42 100644
> --- a/drivers/gpu/drm/radeon/radeon_atombios.c
> +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
> @@ -440,7 +440,9 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
>         */
>        if ((dev->pdev->device == 0x9498) &&
>            (dev->pdev->subsystem_vendor == 0x1682) &&
> -           (dev->pdev->subsystem_device == 0x2452)) {
> +           (dev->pdev->subsystem_device == 0x2452) &&
> +           (i2c_bus->valid == false) &&
> +           !(supported_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))) {
>                struct radeon_device *rdev = dev->dev_private;
>                *i2c_bus = radeon_lookup_i2c_gpio(rdev, 0x93);
>        }
> --
> 1.7.7.5
>