diff options
author | Yongqiang Sun | 2017-08-24 23:29:24 +0200 |
---|---|---|
committer | Alex Deucher | 2017-09-27 00:17:09 +0200 |
commit | e1b522bff39d4834f4cfedc557857bb4d50f3946 (patch) | |
tree | 130a1ddccad10e014b65c008d8fa7f650ed60cd6 /drivers/gpu/drm/amd/display/dc/calcs | |
parent | drm/amd/display: do not reset lane count in EQ fallback (diff) | |
download | kernel-qcow2-linux-e1b522bff39d4834f4cfedc557857bb4d50f3946.tar.gz kernel-qcow2-linux-e1b522bff39d4834f4cfedc557857bb4d50f3946.tar.xz kernel-qcow2-linux-e1b522bff39d4834f4cfedc557857bb4d50f3946.zip |
drm/amd/display: work around for 8k sleep crash
Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/calcs')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c index 5e5766a63a47..6c85a54e47d6 100644 --- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c @@ -581,6 +581,7 @@ static void split_stream_across_pipes( secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx]; secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx]; if (primary_pipe->bottom_pipe) { + ASSERT(primary_pipe->bottom_pipe != secondary_pipe); secondary_pipe->bottom_pipe = primary_pipe->bottom_pipe; secondary_pipe->bottom_pipe->top_pipe = secondary_pipe; } |