tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

radeon/audio: consolidate audio_fini() functions

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Slava Grigorev and committed by
Alex Deucher 7991d665 8bf59820

+26 -41
+1 -1
drivers/gpu/drm/radeon/cik.c
··· 8576 8576 { 8577 8577 radeon_kfd_suspend(rdev); 8578 8578 radeon_pm_suspend(rdev); 8579 - dce6_audio_fini(rdev); 8579 + radeon_audio_fini(rdev); 8580 8580 radeon_vm_manager_fini(rdev); 8581 8581 cik_cp_enable(rdev, false); 8582 8582 cik_sdma_enable(rdev, false);
-13
drivers/gpu/drm/radeon/dce6_afmt.c
··· 248 248 WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL, 249 249 enable_mask ? AUDIO_ENABLED : 0); 250 250 } 251 - 252 - void dce6_audio_fini(struct radeon_device *rdev) 253 - { 254 - int i; 255 - 256 - if (!rdev->audio.enabled) 257 - return; 258 - 259 - for (i = 0; i < rdev->audio.num_pins; i++) 260 - radeon_audio_enable(rdev, &rdev->audio.pin[i], false); 261 - 262 - rdev->audio.enabled = false; 263 - }
+2 -2
drivers/gpu/drm/radeon/evergreen.c
··· 5333 5333 int evergreen_suspend(struct radeon_device *rdev) 5334 5334 { 5335 5335 radeon_pm_suspend(rdev); 5336 - r600_audio_fini(rdev); 5336 + radeon_audio_fini(rdev); 5337 5337 uvd_v1_0_fini(rdev); 5338 5338 radeon_uvd_suspend(rdev); 5339 5339 r700_cp_stop(rdev); ··· 5483 5483 void evergreen_fini(struct radeon_device *rdev) 5484 5484 { 5485 5485 radeon_pm_fini(rdev); 5486 - r600_audio_fini(rdev); 5486 + radeon_audio_fini(rdev); 5487 5487 r700_cp_fini(rdev); 5488 5488 r600_dma_fini(rdev); 5489 5489 r600_irq_fini(rdev);
+1 -4
drivers/gpu/drm/radeon/ni.c
··· 2135 2135 int cayman_suspend(struct radeon_device *rdev) 2136 2136 { 2137 2137 radeon_pm_suspend(rdev); 2138 - if (ASIC_IS_DCE6(rdev)) 2139 - dce6_audio_fini(rdev); 2140 - else 2141 - r600_audio_fini(rdev); 2138 + radeon_audio_fini(rdev); 2142 2139 radeon_vm_manager_fini(rdev); 2143 2140 cayman_cp_enable(rdev, false); 2144 2141 cayman_dma_stop(rdev);
+2 -2
drivers/gpu/drm/radeon/r600.c
··· 3106 3106 int r600_suspend(struct radeon_device *rdev) 3107 3107 { 3108 3108 radeon_pm_suspend(rdev); 3109 - r600_audio_fini(rdev); 3109 + radeon_audio_fini(rdev); 3110 3110 r600_cp_stop(rdev); 3111 3111 if (rdev->has_uvd) { 3112 3112 uvd_v1_0_fini(rdev); ··· 3225 3225 void r600_fini(struct radeon_device *rdev) 3226 3226 { 3227 3227 radeon_pm_fini(rdev); 3228 - r600_audio_fini(rdev); 3228 + radeon_audio_fini(rdev); 3229 3229 r600_cp_fini(rdev); 3230 3230 r600_irq_fini(rdev); 3231 3231 if (rdev->has_uvd) {
-13
drivers/gpu/drm/radeon/r600_hdmi.c
··· 183 183 WREG32(AZ_HOT_PLUG_CONTROL, tmp); 184 184 } 185 185 186 - /* 187 - * release the audio timer 188 - * TODO: How to do this correctly on SMP systems? 189 - */ 190 - void r600_audio_fini(struct radeon_device *rdev) 191 - { 192 - if (!rdev->audio.enabled) 193 - return; 194 - 195 - radeon_audio_enable(rdev, &rdev->audio.pin[0], 0); 196 - rdev->audio.enabled = false; 197 - } 198 - 199 186 struct r600_audio_pin *r600_audio_get_pin(struct radeon_device *rdev) 200 187 { 201 188 /* only one pin on 6xx-NI */
+13
drivers/gpu/drm/radeon/radeon_audio.c
··· 380 380 if (rdev->audio.funcs->enable) 381 381 rdev->audio.funcs->enable(rdev, pin, enable_mask); 382 382 } 383 + 384 + void radeon_audio_fini(struct radeon_device *rdev) 385 + { 386 + int i; 387 + 388 + if (!rdev->audio.enabled) 389 + return; 390 + 391 + for (i = 0; i < rdev->audio.num_pins; i++) 392 + radeon_audio_enable(rdev, &rdev->audio.pin[i], false); 393 + 394 + rdev->audio.enabled = false; 395 + }
+1
drivers/gpu/drm/radeon/radeon_audio.h
··· 68 68 void radeon_audio_select_pin(struct drm_encoder *encoder); 69 69 void radeon_audio_enable(struct radeon_device *rdev, 70 70 struct r600_audio_pin *pin, u8 enable_mask); 71 + void radeon_audio_fini(struct radeon_device *rdev); 71 72 72 73 #endif
+2 -2
drivers/gpu/drm/radeon/rs600.c
··· 1054 1054 int rs600_suspend(struct radeon_device *rdev) 1055 1055 { 1056 1056 radeon_pm_suspend(rdev); 1057 - r600_audio_fini(rdev); 1057 + radeon_audio_fini(rdev); 1058 1058 r100_cp_disable(rdev); 1059 1059 radeon_wb_disable(rdev); 1060 1060 rs600_irq_disable(rdev); ··· 1065 1065 void rs600_fini(struct radeon_device *rdev) 1066 1066 { 1067 1067 radeon_pm_fini(rdev); 1068 - r600_audio_fini(rdev); 1068 + radeon_audio_fini(rdev); 1069 1069 r100_cp_fini(rdev); 1070 1070 radeon_wb_fini(rdev); 1071 1071 radeon_ib_pool_fini(rdev);
+2 -2
drivers/gpu/drm/radeon/rs690.c
··· 771 771 int rs690_suspend(struct radeon_device *rdev) 772 772 { 773 773 radeon_pm_suspend(rdev); 774 - r600_audio_fini(rdev); 774 + radeon_audio_fini(rdev); 775 775 r100_cp_disable(rdev); 776 776 radeon_wb_disable(rdev); 777 777 rs600_irq_disable(rdev); ··· 782 782 void rs690_fini(struct radeon_device *rdev) 783 783 { 784 784 radeon_pm_fini(rdev); 785 - r600_audio_fini(rdev); 785 + radeon_audio_fini(rdev); 786 786 r100_cp_fini(rdev); 787 787 radeon_wb_fini(rdev); 788 788 radeon_ib_pool_fini(rdev);
+1 -1
drivers/gpu/drm/radeon/rv770.c
··· 1830 1830 int rv770_suspend(struct radeon_device *rdev) 1831 1831 { 1832 1832 radeon_pm_suspend(rdev); 1833 - r600_audio_fini(rdev); 1833 + radeon_audio_fini(rdev); 1834 1834 uvd_v1_0_fini(rdev); 1835 1835 radeon_uvd_suspend(rdev); 1836 1836 r700_cp_stop(rdev);
+1 -1
drivers/gpu/drm/radeon/si.c
··· 6909 6909 int si_suspend(struct radeon_device *rdev) 6910 6910 { 6911 6911 radeon_pm_suspend(rdev); 6912 - dce6_audio_fini(rdev); 6912 + radeon_audio_fini(rdev); 6913 6913 radeon_vm_manager_fini(rdev); 6914 6914 si_cp_enable(rdev, false); 6915 6915 cayman_dma_stop(rdev);