diff options
| author | Eric Bernstein <eric.bernstein@amd.com> | 2022-03-21 10:42:34 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-04-05 10:29:47 -0400 |
| commit | 35b2186b13b66075035fa008e9390d14b331e1b3 (patch) | |
| tree | 156b4e4f04246ed11f498b3cb300c01e696f1093 /drivers/gpu/drm/amd | |
| parent | 0f12a22f375400a3fc42b86a0f8c23da530fb0fc (diff) | |
| download | linux-35b2186b13b66075035fa008e9390d14b331e1b3.tar.gz linux-35b2186b13b66075035fa008e9390d14b331e1b3.tar.bz2 linux-35b2186b13b66075035fa008e9390d14b331e1b3.zip | |
drm/amd/display: remove assert for odm transition case
Remove assert that will hit during odm transition case,
since this is a valid case.
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index d473708d5399..7802d603f796 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1976,7 +1976,6 @@ int dcn20_validate_apply_pipe_split_flags( /*If need split for odm but 4 way split already*/ if (split[i] == 2 && ((pipe->prev_odm_pipe && !pipe->prev_odm_pipe->prev_odm_pipe) || !pipe->next_odm_pipe)) { - ASSERT(0); /* NOT expected yet */ merge[i] = true; /* 4 -> 2 ODM */ } else if (split[i] == 0 && pipe->prev_odm_pipe) { ASSERT(0); /* NOT expected yet */ |