summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-09-23 15:47:08 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-09-24 11:00:59 -0400
commit99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62 (patch)
treee99b18fab5c08fa874fc6bf33c17320aecfbc89b
parent4b40e5921230beb1951f04d2b1b92c4c88fbad43 (diff)
downloadop-kernel-dev-99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62.zip
op-kernel-dev-99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62.tar.gz
drm/radeon: add missing hdmi callbacks for rv6xx
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> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 5003385..8f7e045 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1004,6 +1004,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_cpdma,
OpenPOWER on IntegriCloud