diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2635-drm-amd-display-Explicitly-call-reset-for-each-objec.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2635-drm-amd-display-Explicitly-call-reset-for-each-objec.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2635-drm-amd-display-Explicitly-call-reset-for-each-objec.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2635-drm-amd-display-Explicitly-call-reset-for-each-objec.patch new file mode 100644 index 00000000..44d22889 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2635-drm-amd-display-Explicitly-call-reset-for-each-objec.patch @@ -0,0 +1,74 @@ +From 8e446cb3b8dd139a3baeda7bf5ed7188224efd88 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Fri, 20 Oct 2017 08:43:40 -0400 +Subject: [PATCH 2635/4131] drm/amd/display: Explicitly call ->reset for each + object + +We need to avoid calling reset after detection because the next +commit adds freesync properties on the atomic_state which are set +during detection. Calling reset after this clears them. + +The easiest way to accomplish this right now is to call ->reset on +the connector right after creation but before detection. To stay +consistent call ->reset on every other object as well after creation. + +v2: Provide better reason for this change in commit msg. + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Roman Li <Roman.Li@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++++++++-- + 1 file changed, 12 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 2463b6c..e523fe5 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -1446,8 +1446,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) + goto fail; + } + +- drm_mode_config_reset(dm->ddev); +- + return 0; + fail: + kfree(aencoder); +@@ -3260,6 +3258,11 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, + + drm_plane_helper_add(&aplane->base, &dm_plane_helper_funcs); + ++ /* Create (reset) the plane state */ ++ if (aplane->base.funcs->reset) ++ aplane->base.funcs->reset(&aplane->base); ++ ++ + return res; + } + +@@ -3295,6 +3298,10 @@ static int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm, + + drm_crtc_helper_add(&acrtc->base, &amdgpu_dm_crtc_helper_funcs); + ++ /* Create (reset) the plane state */ ++ if (acrtc->base.funcs->reset) ++ acrtc->base.funcs->reset(&acrtc->base); ++ + acrtc->max_cursor_width = dm->adev->dm.dc->caps.max_cursor_size; + acrtc->max_cursor_height = dm->adev->dm.dc->caps.max_cursor_size; + +@@ -3655,6 +3662,9 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, + &aconnector->base, + &amdgpu_dm_connector_helper_funcs); + ++ if (aconnector->base.funcs->reset) ++ aconnector->base.funcs->reset(&aconnector->base); ++ + amdgpu_dm_connector_init_helper( + dm, + aconnector, +-- +2.7.4 + |