diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2097-drm-amd-display-Always-allocate-initial-connector-st.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2097-drm-amd-display-Always-allocate-initial-connector-st.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2097-drm-amd-display-Always-allocate-initial-connector-st.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2097-drm-amd-display-Always-allocate-initial-connector-st.patch new file mode 100644 index 00000000..cd45b671 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2097-drm-amd-display-Always-allocate-initial-connector-st.patch @@ -0,0 +1,56 @@ +From 5084d859f5ec260374297d72b5cdd1622fbeacb5 Mon Sep 17 00:00:00 2001 +From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Date: Tue, 4 Jun 2019 15:21:14 -0400 +Subject: [PATCH 2097/2940] drm/amd/display: Always allocate initial connector + state state + +[Why] +Unlike our regular connectors, MST connectors don't start off with +an initial connector state. This causes a NULL pointer dereference to +occur when attaching the bpc property since it tries to modify the +connector state. + +We need an initial connector state on the connector to avoid the crash. + +[How] +Use our reset helper to allocate an initial state and reset the values +to their defaults. We were already doing this before, just not for +MST connectors. + +Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Reviewed-by: Leo Li <sunpeng.li@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++++++--- + 1 file changed, 7 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 179c9478a670..1058c49ef588 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -4763,6 +4763,13 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, + { + struct amdgpu_device *adev = dm->ddev->dev_private; + ++ /* ++ * Some of the properties below require access to state, like bpc. ++ * Allocate some default initial connector state with our reset helper. ++ */ ++ if (aconnector->base.funcs->reset) ++ aconnector->base.funcs->reset(&aconnector->base); ++ + aconnector->connector_id = link_index; + aconnector->dc_link = link; + aconnector->base.interlace_allowed = false; +@@ -4949,9 +4956,6 @@ 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.17.1 + |