From: Rafał Miłecki Date: Tue, 8 Oct 2013 09:36:58 +0000 (+0200) Subject: drm/radeon: fix hdmi callbacks for rv6xx (incorrectly added to r520) X-Git-Tag: v3.11.5~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=681231c66e1953a91addca97eb83d5565d3bffaa;p=thirdparty%2Fkernel%2Fstable.git drm/radeon: fix hdmi callbacks for rv6xx (incorrectly added to r520) Commit 99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62 was backported slightly wrong adding callbacks in the wrong struct. This moves callbacks to the correct place (matching mainline patch/code). Signed-off-by: Rafał Miłecki Reviewed-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index 128279e0059b5..8e5438e9bbf24 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c @@ -926,8 +926,6 @@ 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, @@ -1115,6 +1113,8 @@ static struct radeon_asic rv6xx_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 = &r600_copy_blit,