diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3836-drm-amd-display-Separate-hardware-initialization-fro.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3836-drm-amd-display-Separate-hardware-initialization-fro.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3836-drm-amd-display-Separate-hardware-initialization-fro.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3836-drm-amd-display-Separate-hardware-initialization-fro.patch new file mode 100644 index 00000000..26ee7990 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3836-drm-amd-display-Separate-hardware-initialization-fro.patch @@ -0,0 +1,80 @@ +From 059ea4e591abd40d0726d22c38b29f4b5c99cb73 Mon Sep 17 00:00:00 2001 +From: Julian Parkin <julian.parkin@amd.com> +Date: Mon, 12 Aug 2019 18:47:50 -0400 +Subject: [PATCH 3836/4256] drm/amd/display: Separate hardware initialization + from creation + +[Why] +Separating the hardware initialization from the creation of the +dc structures gives greater flexibility to the dm to override +options for debugging. + +[How] +Move the hardware initialization call to a new function, +dc_hardware_init. No functional change is intended. + +Signed-off-by: Julian Parkin <julian.parkin@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Leo Li <sunpeng.li@amd.com> +Acked-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 8 +++++--- + drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ + 3 files changed, 9 insertions(+), 3 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 1b63ce6b9370..f3e1193e9ce4 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -711,6 +711,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) + goto error; + } + ++ dc_hardware_init(adev->dm.dc); ++ + adev->dm.freesync_module = mod_freesync_create(adev->dm.dc); + if (!adev->dm.freesync_module) { + DRM_ERROR( +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 1139a365aa8d..ffa6544f1e25 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -794,9 +794,6 @@ struct dc *dc_create(const struct dc_init_data *init_params) + if (false == construct(dc, init_params)) + goto construct_fail; + +- /*TODO: separate HW and SW initialization*/ +- dc->hwss.init_hw(dc); +- + full_pipe_count = dc->res_pool->pipe_count; + if (dc->res_pool->underlay_pipe_index != NO_UNDERLAY_PIPE) + full_pipe_count--; +@@ -829,6 +826,11 @@ struct dc *dc_create(const struct dc_init_data *init_params) + return NULL; + } + ++void dc_hardware_init(struct dc *dc) ++{ ++ dc->hwss.init_hw(dc); ++} ++ + void dc_init_callbacks(struct dc *dc, + const struct dc_callback_init *init_params) + { +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 09f0a6d1ac5a..a1697486b352 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -570,6 +570,8 @@ struct dc_callback_init { + }; + + struct dc *dc_create(const struct dc_init_data *init_params); ++void dc_hardware_init(struct dc *dc); ++ + int dc_get_vmid_use_vector(struct dc *dc); + #ifdef CONFIG_DRM_AMD_DC_DCN2_0 + void dc_setup_vm_context(struct dc *dc, struct dc_virtual_addr_space_config *va_config, int vmid); +-- +2.17.1 + |