diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3714-drm-amdkcl-import-kfd-merge-code-for-amdgpu_vm-compi.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3714-drm-amdkcl-import-kfd-merge-code-for-amdgpu_vm-compi.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3714-drm-amdkcl-import-kfd-merge-code-for-amdgpu_vm-compi.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3714-drm-amdkcl-import-kfd-merge-code-for-amdgpu_vm-compi.patch new file mode 100644 index 00000000..465ce859 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3714-drm-amdkcl-import-kfd-merge-code-for-amdgpu_vm-compi.patch @@ -0,0 +1,82 @@ +From fe1f2ddfb60063c899620802bf30e52f855fcb85 Mon Sep 17 00:00:00 2001 +From: Kevin Wang <Kevin1.Wang@amd.com> +Date: Tue, 20 Mar 2018 10:32:51 +0800 +Subject: [PATCH 3714/4131] drm/amdkcl: import kfd merge code for amdgpu_vm + compile error + +Change-Id: I54b484e9c22a2acb0d5e165a5a0cf315f5cbd0c8 +Signed-off-by: Kevin Wang <Kevin1.Wang@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 17 +++++++++++++++-- + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index b97c360..f1cd42d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -2385,7 +2385,7 @@ static void amdgpu_inc_compute_vms(struct amdgpu_device *adev) + /* First Compute VM: enable compute power profile */ + if (adev->powerplay.pp_funcs->switch_power_profile) + amdgpu_dpm_switch_power_profile(adev, +- PP_SMC_POWER_PROFILE_COMPUTE); ++ PP_SMC_POWER_PROFILE_COMPUTE, true); + } + mutex_unlock(&id_mgr->lock); + } +@@ -2667,7 +2667,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) + /* Last KFD VM: enable graphics power profile */ + if (adev->powerplay.pp_funcs->switch_power_profile) + amdgpu_dpm_switch_power_profile(adev, +- AMD_PP_GFX_PROFILE); ++ PP_SMC_POWER_PROFILE_COMPUTE, true); + } + mutex_unlock(&id_mgr->lock); + } +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +index f3973a5..4378f13 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -1846,6 +1846,19 @@ static bool dp_active_dongle_validate_timing( + const struct dpcd_caps *dpcd_caps) + { + unsigned int required_pix_clk = timing->pix_clk_khz; ++ const struct dc_dongle_caps *dongle_caps = &dpcd_caps->dongle_caps; ++ ++ switch (dpcd_caps->dongle_type) { ++ case DISPLAY_DONGLE_DP_VGA_CONVERTER: ++ case DISPLAY_DONGLE_DP_DVI_CONVERTER: ++ case DISPLAY_DONGLE_DP_DVI_DONGLE: ++ if (timing->pixel_encoding == PIXEL_ENCODING_RGB) ++ return true; ++ else ++ return false; ++ default: ++ break; ++ } + + if (dongle_caps->dongle_type != DISPLAY_DONGLE_DP_HDMI_CONVERTER || + dongle_caps->extendedCapValid == false) +@@ -1911,7 +1924,7 @@ enum dc_status dc_link_validate_mode_timing( + const struct dc_crtc_timing *timing) + { + uint32_t max_pix_clk = stream->sink->dongle_max_pix_clk; +- struct dc_dongle_caps *dongle_caps = &link->dpcd_caps.dongle_caps; ++ struct dpcd_caps *dpcd_caps = &link->dpcd_caps; + + /* A hack to avoid failing any modes for EDID override feature on + * topology change such as lower quality cable for DP or different dongle +@@ -1924,7 +1937,7 @@ enum dc_status dc_link_validate_mode_timing( + return DC_EXCEED_DONGLE_CAP; + + /* Active Dongle*/ +- if (!dp_active_dongle_validate_timing(timing, dongle_caps)) ++ if (!dp_active_dongle_validate_timing(timing, dpcd_caps)) + return DC_EXCEED_DONGLE_CAP; + + switch (stream->signal) { +-- +2.7.4 + |