drm/amdgpu: drop hw access in non-DC audio fini

alexdeucher · Ulrich Hecht · commit 12b7669fe812 · 2025-10-16T12:15:29.000+02:00
commit 71403f58b4bb6c13b71c05505593a355f697fd94 upstream. We already disable the audio pins in hw_fini so there is no need to do it again in sw_fini. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4481 Cc: oushixiong <oushixiong1025@163.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 5eeb16ca727f11278b2917fd4311a7d7efb0bbd6) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1437,17 +1437,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev)
 
 static void dce_v10_0_audio_fini(struct amdgpu_device *adev)
 {
-	int i;
-
 	if (!amdgpu_audio)
 		return;
 
 	if (!adev->mode_info.audio.enabled)
 		return;
 
-	for (i = 0; i < adev->mode_info.audio.num_pins; i++)
-		dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
-
 	adev->mode_info.audio.enabled = false;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -1479,17 +1479,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev)
 
 static void dce_v11_0_audio_fini(struct amdgpu_device *adev)
 {
-	int i;
-
 	if (!amdgpu_audio)
 		return;
 
 	if (!adev->mode_info.audio.enabled)
 		return;
 
-	for (i = 0; i < adev->mode_info.audio.num_pins; i++)
-		dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
-
 	adev->mode_info.audio.enabled = false;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1348,17 +1348,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev)
 
 static void dce_v6_0_audio_fini(struct amdgpu_device *adev)
 {
-	int i;
-
 	if (!amdgpu_audio)
 		return;
 
 	if (!adev->mode_info.audio.enabled)
 		return;
 
-	for (i = 0; i < adev->mode_info.audio.num_pins; i++)
-		dce_v6_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
-
 	adev->mode_info.audio.enabled = false;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -1400,17 +1400,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev)
 
 static void dce_v8_0_audio_fini(struct amdgpu_device *adev)
 {
-	int i;
-
 	if (!amdgpu_audio)
 		return;
 
 	if (!adev->mode_info.audio.enabled)
 		return;
 
-	for (i = 0; i < adev->mode_info.audio.num_pins; i++)
-		dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
-
 	adev->mode_info.audio.enabled = false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1437,17 +1437,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev)`
`1437`	`1437`
`1438`	`1438`	`static void dce_v10_0_audio_fini(struct amdgpu_device *adev)`
`1439`	`1439`	`{`
`1440`		`- int i;`
`1441`		`-`
`1442`	`1440`	`if (!amdgpu_audio)`
`1443`	`1441`	`return;`
`1444`	`1442`
`1445`	`1443`	`if (!adev->mode_info.audio.enabled)`
`1446`	`1444`	`return;`
`1447`	`1445`
`1448`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1449`		`- dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1450`		`-`
`1451`	`1446`	`adev->mode_info.audio.enabled = false;`
`1452`	`1447`	`}`
`1453`	`1448`
Original file line number	Diff line number	Diff line change
`@@ -1479,17 +1479,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev)`
`1479`	`1479`
`1480`	`1480`	`static void dce_v11_0_audio_fini(struct amdgpu_device *adev)`
`1481`	`1481`	`{`
`1482`		`- int i;`
`1483`		`-`
`1484`	`1482`	`if (!amdgpu_audio)`
`1485`	`1483`	`return;`
`1486`	`1484`
`1487`	`1485`	`if (!adev->mode_info.audio.enabled)`
`1488`	`1486`	`return;`
`1489`	`1487`
`1490`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1491`		`- dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1492`		`-`
`1493`	`1488`	`adev->mode_info.audio.enabled = false;`
`1494`	`1489`	`}`
`1495`	`1490`
Original file line number	Diff line number	Diff line change
`@@ -1348,17 +1348,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev)`
`1348`	`1348`
`1349`	`1349`	`static void dce_v6_0_audio_fini(struct amdgpu_device *adev)`
`1350`	`1350`	`{`
`1351`		`- int i;`
`1352`		`-`
`1353`	`1351`	`if (!amdgpu_audio)`
`1354`	`1352`	`return;`
`1355`	`1353`
`1356`	`1354`	`if (!adev->mode_info.audio.enabled)`
`1357`	`1355`	`return;`
`1358`	`1356`
`1359`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1360`		`- dce_v6_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1361`		`-`
`1362`	`1357`	`adev->mode_info.audio.enabled = false;`
`1363`	`1358`	`}`
`1364`	`1359`
Original file line number	Diff line number	Diff line change
`@@ -1400,17 +1400,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev)`
`1400`	`1400`
`1401`	`1401`	`static void dce_v8_0_audio_fini(struct amdgpu_device *adev)`
`1402`	`1402`	`{`
`1403`		`- int i;`
`1404`		`-`
`1405`	`1403`	`if (!amdgpu_audio)`
`1406`	`1404`	`return;`
`1407`	`1405`
`1408`	`1406`	`if (!adev->mode_info.audio.enabled)`
`1409`	`1407`	`return;`
`1410`	`1408`
`1411`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1412`		`- dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1413`		`-`
`1414`	`1409`	`adev->mode_info.audio.enabled = false;`
`1415`	`1410`	`}`
`1416`	`1411`