diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0291-drm-amd-display-Fix-the-NULL-pointer.-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/0291-drm-amd-display-Fix-the-NULL-pointer.-v2.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0291-drm-amd-display-Fix-the-NULL-pointer.-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0291-drm-amd-display-Fix-the-NULL-pointer.-v2.patch new file mode 100644 index 00000000..4b37755a --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0291-drm-amd-display-Fix-the-NULL-pointer.-v2.patch @@ -0,0 +1,47 @@ +From 58529518ed65015ff8e26c63ea51f432827fa433 Mon Sep 17 00:00:00 2001 +From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> +Date: Thu, 16 Mar 2017 15:51:00 -0400 +Subject: [PATCH 0291/4131] drm/amd/display: Fix the NULL pointer. (v2) + +ret value in amdgpu_dm_atomic_check was not rest to EINVAL +after drm_atomic_add_affected_planes and by this making +any subsequent validation failure pass when returning +to atomic_check. + +v2: Add WARN_ON print for dc_commit_streams in +amdgpu_dm_atomic_commit_tail since this should never +fail. + +Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@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_types.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +index 908cc3d..4c45d03 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +@@ -2562,7 +2562,7 @@ void amdgpu_dm_atomic_commit_tail( + } + + /* DC is optimized not to do anything if 'streams' didn't change. */ +- dc_commit_streams(dm->dc, commit_streams, commit_streams_count); ++ WARN_ON(!dc_commit_streams(dm->dc, commit_streams, commit_streams_count)); + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); +@@ -3028,6 +3028,8 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, + ret = drm_atomic_add_affected_planes(state, crtc); + if (ret) + return ret; ++ ++ ret = -EINVAL; + } + + for (i = 0; i < set_count; i++) { +-- +2.7.4 + |