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

alexdeucher · gregkh · commit f4dbf2378a33 · 2025-09-09T19:02:32.000+02:00
commit 71403f5 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 5eeb16c) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1462,17 +1462,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
@@ -1511,17 +1511,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
@@ -1451,17 +1451,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
@@ -1443,17 +1443,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
`@@ -1462,17 +1462,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev)`
`1462`	`1462`
`1463`	`1463`	`static void dce_v10_0_audio_fini(struct amdgpu_device *adev)`
`1464`	`1464`	`{`
`1465`		`- int i;`
`1466`		`-`
`1467`	`1465`	`if (!amdgpu_audio)`
`1468`	`1466`	`return;`
`1469`	`1467`
`1470`	`1468`	`if (!adev->mode_info.audio.enabled)`
`1471`	`1469`	`return;`
`1472`	`1470`
`1473`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1474`		`- dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1475`		`-`
`1476`	`1471`	`adev->mode_info.audio.enabled = false;`
`1477`	`1472`	`}`
`1478`	`1473`
Original file line number	Diff line number	Diff line change
`@@ -1511,17 +1511,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev)`
`1511`	`1511`
`1512`	`1512`	`static void dce_v11_0_audio_fini(struct amdgpu_device *adev)`
`1513`	`1513`	`{`
`1514`		`- int i;`
`1515`		`-`
`1516`	`1514`	`if (!amdgpu_audio)`
`1517`	`1515`	`return;`
`1518`	`1516`
`1519`	`1517`	`if (!adev->mode_info.audio.enabled)`
`1520`	`1518`	`return;`
`1521`	`1519`
`1522`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1523`		`- dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1524`		`-`
`1525`	`1520`	`adev->mode_info.audio.enabled = false;`
`1526`	`1521`	`}`
`1527`	`1522`
Original file line number	Diff line number	Diff line change
`@@ -1451,17 +1451,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev)`
`1451`	`1451`
`1452`	`1452`	`static void dce_v6_0_audio_fini(struct amdgpu_device *adev)`
`1453`	`1453`	`{`
`1454`		`- int i;`
`1455`		`-`
`1456`	`1454`	`if (!amdgpu_audio)`
`1457`	`1455`	`return;`
`1458`	`1456`
`1459`	`1457`	`if (!adev->mode_info.audio.enabled)`
`1460`	`1458`	`return;`
`1461`	`1459`
`1462`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1463`		`- dce_v6_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1464`		`-`
`1465`	`1460`	`adev->mode_info.audio.enabled = false;`
`1466`	`1461`	`}`
`1467`	`1462`
Original file line number	Diff line number	Diff line change
`@@ -1443,17 +1443,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev)`
`1443`	`1443`
`1444`	`1444`	`static void dce_v8_0_audio_fini(struct amdgpu_device *adev)`
`1445`	`1445`	`{`
`1446`		`- int i;`
`1447`		`-`
`1448`	`1446`	`if (!amdgpu_audio)`
`1449`	`1447`	`return;`
`1450`	`1448`
`1451`	`1449`	`if (!adev->mode_info.audio.enabled)`
`1452`	`1450`	`return;`
`1453`	`1451`
`1454`		`- for (i = 0; i < adev->mode_info.audio.num_pins; i++)`
`1455`		`- dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);`
`1456`		`-`
`1457`	`1452`	`adev->mode_info.audio.enabled = false;`
`1458`	`1453`	`}`
`1459`	`1454`