diff options
| author | Jakub Kicinski <[email protected]> | 2025-02-20 18:36:34 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-02-20 18:37:30 +0000 |
| commit | 5d6ba5ab8582aa35c1ee98e47af28e6f6772596c (patch) | |
| tree | a4a3a2d311773c19909c9928273e0bcae01a39ce /drivers/gpu/drm/amd/pm/amdgpu_dpm.c | |
| parent | Merge tag 'linux-can-next-for-6.15-20250219' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | Merge tag 'net-6.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-5d6ba5ab8582aa35c1ee98e47af28e6f6772596c.tar.gz kernel-5d6ba5ab8582aa35c1ee98e47af28e6f6772596c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc4).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/amdgpu_dpm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c index 6a9e26905edf..7a22aef6e59c 100644 --- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c +++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c @@ -78,7 +78,7 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, int ret = 0; const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; enum ip_power_state pwr_state = gate ? POWER_STATE_OFF : POWER_STATE_ON; - bool is_vcn = (block_type == AMD_IP_BLOCK_TYPE_UVD || block_type == AMD_IP_BLOCK_TYPE_VCN); + bool is_vcn = block_type == AMD_IP_BLOCK_TYPE_VCN; if (atomic_read(&adev->pm.pwr_state[block_type]) == pwr_state && (!is_vcn || adev->vcn.num_vcn_inst == 1)) { |