diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-06-24 10:02:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-06-24 10:02:45 +0200 |
| commit | 5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28 (patch) | |
| tree | 75d09ba90c72e75b3d488edd2c37c96c3f268952 /drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | |
| parent | 3099406ef4832124ce572cfbbc914e8a385ca38f (diff) | |
| parent | 3b7961a326f8a7e03f54a19f02fedae8d488b80f (diff) | |
| download | linux-5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28.tar.bz2 | |
Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Fixes for v5.13
A final batch of fixes for v5.13, this is larger than I'd like due to
the fixes for a series of suspend issues that Intel turned up in their
testing this week.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index cf165ab5dd26..14470da52113 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -373,7 +373,7 @@ static int vcn_v3_0_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_ring *ring; - int i, j; + int i; for (i = 0; i < adev->vcn.num_vcn_inst; ++i) { if (adev->vcn.harvest_config & (1 << i)) @@ -388,12 +388,6 @@ static int vcn_v3_0_hw_fini(void *handle) vcn_v3_0_set_powergating_state(adev, AMD_PG_STATE_GATE); } } - ring->sched.ready = false; - - for (j = 0; j < adev->vcn.num_enc_rings; ++j) { - ring = &adev->vcn.inst[i].ring_enc[j]; - ring->sched.ready = false; - } } return 0; |