diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3562-drm-amdgpu-display-add-flag-for-multi-display-mclk-s.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3562-drm-amdgpu-display-add-flag-for-multi-display-mclk-s.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3562-drm-amdgpu-display-add-flag-for-multi-display-mclk-s.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3562-drm-amdgpu-display-add-flag-for-multi-display-mclk-s.patch new file mode 100644 index 00000000..1dcda113 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3562-drm-amdgpu-display-add-flag-for-multi-display-mclk-s.patch @@ -0,0 +1,80 @@ +From 76c9008510e07b498564da8fd69f035537d1007a Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Thu, 22 Aug 2019 14:17:57 -0500 +Subject: [PATCH 3562/4256] drm/amdgpu/display: add flag for multi-display mclk + switching + +Add a dcfeaturemask flag for mclk switching. Disable by default; +enable once the feature has seen more testing. + +Set amdgpu.dcfeaturemask=2 on the kernel command line in grub +to enable this. + +Acked-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 5 ++++- + drivers/gpu/drm/amd/display/dc/dc.h | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + 4 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 4bec6ffb3940..1171949361af 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -692,6 +692,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) + if (amdgpu_dc_feature_mask & DC_FBC_MASK) + init_data.flags.fbc_support = true; + ++ if (amdgpu_dc_feature_mask & DC_MULTI_MON_PP_MCLK_SWITCH_MASK) ++ init_data.flags.multi_mon_pp_mclk_switch = true; ++ + init_data.flags.power_down_display_on_boot = true; + + #ifdef CONFIG_DRM_AMD_DC_DCN2_0 +diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +index 562489fdbc22..dfec7ebb4db8 100644 +--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c ++++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +@@ -3023,7 +3023,10 @@ bool bw_calcs(struct dc_context *ctx, + + populate_initial_data(pipe, pipe_count, data); + +- calcs_output->all_displays_in_sync = all_displays_in_sync(pipe, pipe_count); ++ if (ctx->dc->config.multi_mon_pp_mclk_switch) ++ calcs_output->all_displays_in_sync = all_displays_in_sync(pipe, pipe_count); ++ else ++ calcs_output->all_displays_in_sync = false; + + if (data->number_of_displays != 0) { + uint8_t yclk_lvl, sclk_lvl; +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 85863dcf8456..81b986acbae6 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -223,7 +223,7 @@ struct dc_config { + bool power_down_display_on_boot; + bool edp_not_connected; + bool forced_clocks; +- ++ bool multi_mon_pp_mclk_switch; + }; + + enum visual_confirm { +diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h +index a0a7211438f2..8889aaceec60 100644 +--- a/drivers/gpu/drm/amd/include/amd_shared.h ++++ b/drivers/gpu/drm/amd/include/amd_shared.h +@@ -142,6 +142,7 @@ enum PP_FEATURE_MASK { + + enum DC_FEATURE_MASK { + DC_FBC_MASK = 0x1, ++ DC_MULTI_MON_PP_MCLK_SWITCH_MASK = 0x2, + }; + + enum amd_dpm_forced_level; +-- +2.17.1 + |