diff mbox

drm/radeon: add missing hdmi callbacks for rv6xx

Message ID 1379965848-8925-1-git-send-email-alexander.deucher@amd.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alex Deucher Sept. 23, 2013, 7:50 p.m. UTC
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>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_asic.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Christian König Sept. 24, 2013, 7:01 a.m. UTC | #1
Am 23.09.2013 21:50, schrieb Alex Deucher:
> 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>
> Cc: stable@vger.kernel.org

Ah, yes of course. Noted this while looking into the DPM patches as 
well, but totally forgotten about it.

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/radeon/radeon_asic.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> 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,
diff mbox

Patch

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,