diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3666-drm-amd-display-disable-CRTCs-with-NULL-FB-on-their-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3666-drm-amd-display-disable-CRTCs-with-NULL-FB-on-their-.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3666-drm-amd-display-disable-CRTCs-with-NULL-FB-on-their-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3666-drm-amd-display-disable-CRTCs-with-NULL-FB-on-their-.patch new file mode 100644 index 00000000..f9e10370 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3666-drm-amd-display-disable-CRTCs-with-NULL-FB-on-their-.patch @@ -0,0 +1,71 @@ +From ff82d2b87e910168b9820f3ec1a1c8772915c058 Mon Sep 17 00:00:00 2001 +From: Shirish S <shirish.s@amd.com> +Date: Wed, 28 Feb 2018 12:14:58 +0530 +Subject: [PATCH 3666/4131] drm/amd/display: disable CRTCs with NULL FB on + their primary plane (V2) + +The below commit + +"drm/atomic: Try to preserve the crtc enabled state in drm_atomic_remove_fb, v2" + +introduces a slight behavioral change to rmfb. Instead of disabling a crtc +when the primary plane is disabled, it now preserves it. + +This change leads to BUG hit while performing atomic commit on amd driver. + +As a fix this patch ensures that we disable the CRTC's with NULL FB by returning +-EINVAL and hence triggering fall back to the old behavior and turning off the +crtc in atomic_remove_fb(). + +V2: Added error check for plane_state and removed sanity check for crtc. + +Signed-off-by: Shirish S <shirish.s@amd.com> +Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com> +Reviewed-by: Harry Wentland <harry.wentland@amd.com> + +Conflicts: + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c + +Change-Id: I20378b038ee28b2f332d6ac6ce4280313556b168 +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +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 f136ada..4652515 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -4909,6 +4909,30 @@ static int dm_update_planes_state(struct dc *dc, + return ret; + } + ++static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state, ++ struct drm_crtc *crtc) ++{ ++ struct drm_plane *plane; ++ struct drm_crtc_state *crtc_state; ++ ++ WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc)); ++ ++ drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) { ++ struct drm_plane_state *plane_state = ++ drm_atomic_get_plane_state(state, plane); ++ ++ if (IS_ERR(plane_state)) ++ return -EDEADLK; ++ ++ crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc); ++ if (crtc->primary == plane && crtc_state->active) { ++ if (!plane_state->fb) ++ return -EINVAL; ++ } ++ } ++ return 0; ++} ++ + static int amdgpu_dm_atomic_check(struct drm_device *dev, + struct drm_atomic_state *state) + { +-- +2.7.4 + |