| From zajec5@gmail.com Thu Oct 10 15:45:20 2013 |
| From: Rafał Miłecki <zajec5@gmail.com> |
| Date: Thu, 10 Oct 2013 07:56:07 +0200 |
| Subject: Revert "drm/radeon: add missing hdmi callbacks for rv6xx" |
| To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org |
| Cc: Rafał Miłecki <zajec5@gmail.com>, Alex Deucher <alexander.deucher@amd.com> |
| Message-ID: <1381384567-19390-1-git-send-email-zajec5@gmail.com> |
| |
| From: Rafał Miłecki <zajec5@gmail.com> |
| |
| This reverts commit b2a9484006875ecd7d94582e7bcb72a02682be92. |
| |
| Commit 99d79aa2f3b7729e7290e8bda5d0dd8b0240ec62 (backported by |
| b2a9484006875ecd7d94582e7bcb72a02682be92) was supposed to fix rv6xx_asic |
| struct. |
| |
| In kernel 3.10 we didn't have that struct yet, so the original patch |
| should never be backported to the 3.10. Accidentally it has applied and |
| modified different struct (r520_asic) that shouldn't have any HDMI |
| callbacks at all. |
| |
| Signed-off-by: Rafał Miłecki <zajec5@gmail.com> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_asic.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_asic.c |
| +++ b/drivers/gpu/drm/radeon/radeon_asic.c |
| @@ -892,8 +892,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, |
