Skip to content

Commit 71403f5

Browse files
committed
drm/amdgpu: drop hw access in non-DC audio fini
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 <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 5eeb16c) Cc: [email protected]
1 parent a8b79b0 commit 71403f5

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,17 +1462,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev)
14621462

14631463
static void dce_v10_0_audio_fini(struct amdgpu_device *adev)
14641464
{
1465-
int i;
1466-
14671465
if (!amdgpu_audio)
14681466
return;
14691467

14701468
if (!adev->mode_info.audio.enabled)
14711469
return;
14721470

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-
14761471
adev->mode_info.audio.enabled = false;
14771472
}
14781473

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,17 +1511,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev)
15111511

15121512
static void dce_v11_0_audio_fini(struct amdgpu_device *adev)
15131513
{
1514-
int i;
1515-
15161514
if (!amdgpu_audio)
15171515
return;
15181516

15191517
if (!adev->mode_info.audio.enabled)
15201518
return;
15211519

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-
15251520
adev->mode_info.audio.enabled = false;
15261521
}
15271522

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,17 +1451,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev)
14511451

14521452
static void dce_v6_0_audio_fini(struct amdgpu_device *adev)
14531453
{
1454-
int i;
1455-
14561454
if (!amdgpu_audio)
14571455
return;
14581456

14591457
if (!adev->mode_info.audio.enabled)
14601458
return;
14611459

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-
14651460
adev->mode_info.audio.enabled = false;
14661461
}
14671462

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,17 +1443,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev)
14431443

14441444
static void dce_v8_0_audio_fini(struct amdgpu_device *adev)
14451445
{
1446-
int i;
1447-
14481446
if (!amdgpu_audio)
14491447
return;
14501448

14511449
if (!adev->mode_info.audio.enabled)
14521450
return;
14531451

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-
14571452
adev->mode_info.audio.enabled = false;
14581453
}
14591454

0 commit comments

Comments
 (0)