]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/radeon: add missing hdmi callbacks for rv6xx
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 23 Sep 2013 19:47:08 +0000 (15:47 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2013 14:17:58 +0000 (07:17 -0700)
commit 99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62 upstream.

When dpm was merged, I added a new asic struct for
rv6xx, but it never got properly updated when the
hdmi callbacks were added due to the two patch sets
being developed in parallel.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=69729

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/radeon/radeon_asic.c

index 38317b9a4d2d81fb796ce97238e9a22798abea1f..128279e0059b50824283f2f9a7f96c5edb2a2a28 100644 (file)
@@ -926,6 +926,8 @@ static struct radeon_asic r520_asic = {
                .wait_for_vblank = &avivo_wait_for_vblank,
                .set_backlight_level = &atombios_set_backlight_level,
                .get_backlight_level = &atombios_get_backlight_level,
+               .hdmi_enable = &r600_hdmi_enable,
+               .hdmi_setmode = &r600_hdmi_setmode,
        },
        .copy = {
                .blit = &r100_copy_blit,