diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2574-drm-amdgpu-fix-modprobe-failure-for-uvd_4-5-6.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2574-drm-amdgpu-fix-modprobe-failure-for-uvd_4-5-6.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2574-drm-amdgpu-fix-modprobe-failure-for-uvd_4-5-6.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2574-drm-amdgpu-fix-modprobe-failure-for-uvd_4-5-6.patch new file mode 100644 index 00000000..22c56401 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2574-drm-amdgpu-fix-modprobe-failure-for-uvd_4-5-6.patch @@ -0,0 +1,67 @@ +From 600827fd74710ef0c9b36c34ad312b17f6a455f0 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Mon, 24 Jun 2019 19:26:00 +0800 +Subject: [PATCH 2574/2940] drm/amdgpu: fix modprobe failure for uvd_4/5/6 + +For uvd_4/5/6, amdgpu driver will only power on them when +there are jobs assigned to decode/enc rings.uvd_4/5/6 dpm was broken +since amdgpu_dpm_set_powergating_by_smu only covers gfx block. + +The change would add more IP block support in amdgpu_dpm_set_powergating_by_smu +For GFX/UVD/VCN/VCE, if the new SMU driver is supported, invoke new +power gate helper function smu_dpm_set_power_gate, otherwise, fallback to +legacy powerplay helper function pp_set_powergating_by_smu. For other IP blocks +always invoke legacy powerplay helper function. + +Change-Id: I946b17088366ccfa5cabe3f0f8394893907b609d +Reviewed-by: Tianci Yin <tianci.yin@amd.com> +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 11 ++++++++++- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 +++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +index f54a1ef53276..357e45fa5711 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +@@ -948,12 +948,21 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block + + switch (block_type) { + case AMD_IP_BLOCK_TYPE_GFX: ++ case AMD_IP_BLOCK_TYPE_UVD: ++ case AMD_IP_BLOCK_TYPE_VCN: ++ case AMD_IP_BLOCK_TYPE_VCE: + if (swsmu) +- ret = smu_gfx_off_control(&adev->smu, gate); ++ ret = smu_dpm_set_power_gate(&adev->smu, block_type, gate); + else + ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu( + (adev)->powerplay.pp_handle, block_type, gate)); + break; ++ case AMD_IP_BLOCK_TYPE_GMC: ++ case AMD_IP_BLOCK_TYPE_ACP: ++ case AMD_IP_BLOCK_TYPE_SDMA: ++ ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu( ++ (adev)->powerplay.pp_handle, block_type, gate)); ++ break; + default: + break; + } +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index edd1da68c47d..f61ecbfec9bb 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -233,6 +233,9 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type, + case AMD_IP_BLOCK_TYPE_VCE: + ret = smu_dpm_set_vce_enable(smu, gate); + break; ++ case AMD_IP_BLOCK_TYPE_GFX: ++ ret = smu_gfx_off_control(smu, gate); ++ break; + default: + break; + } +-- +2.17.1 + |