> -----Original Message----- > From: Rafał Miłecki [mailto:zajec5@xxxxxxxxx] > Sent: Tuesday, October 08, 2013 5:37 AM > To: Greg Kroah-Hartman; stable@xxxxxxxxxxxxxxx > Cc: Rafał Miłecki; Deucher, Alexander > Subject: [STABLE][PATCH] 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 <zajec5@xxxxxxxxx> > Cc: Alex Deucher <alexander.deucher@xxxxxxx> Thanks for taking care of this. Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > This patch is based on linux-3.11.y. It's needed for stable only. > --- > drivers/gpu/drm/radeon/radeon_asic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_asic.c > b/drivers/gpu/drm/radeon/radeon_asic.c > index 128279e..8e5438e 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, > -- > 1.7.10.4 > ��.n��������+%������w��{.n�����������ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f