summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc
diff options
context:
space:
mode:
authorAlvin Lee <Alvin.Lee2@amd.com>2022-09-08 11:08:25 -0400
committerAlex Deucher <alexander.deucher@amd.com>2022-09-19 15:15:02 -0400
commit2447ba5bee91527d3d49c5271b6c34a84fc67bdc (patch)
treef3c44d3ffbc09dd9e0b04b07429ca86ce75c6711 /drivers/gpu/drm/amd/display/dc
parentc1143ca2d523dee0f6012638068abd202a50a42b (diff)
downloadlinux-stable-2447ba5bee91527d3d49c5271b6c34a84fc67bdc.tar.gz
linux-stable-2447ba5bee91527d3d49c5271b6c34a84fc67bdc.tar.bz2
linux-stable-2447ba5bee91527d3d49c5271b6c34a84fc67bdc.zip
drm/amd/display: Don't allocate DET for phantom pipes
[Why & How] We should not allocate any DET for the phantom pipes. Reviewed-by: Jun Lei <Jun.Lei@amd.com> Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
index 14787e0f0b6e..5490b3705b41 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c
@@ -271,10 +271,20 @@ void dcn32_determine_det_override(struct dc *dc,
struct dc_plane_state *current_plane = NULL;
struct pipe_ctx *next_odm_pipe = NULL;
struct pipe_ctx *bottom_pipe = NULL;
+ uint8_t stream_count = 0;
+
+ for (i = 0; i < context->stream_count; i++) {
+ /* Don't count SubVP streams for DET allocation */
+ if (context->streams[i]->mall_stream_config.type != SUBVP_PHANTOM) {
+ stream_count++;
+ }
+ }
if (context->stream_count > 0) {
- stream_segments = 18 / context->stream_count;
+ stream_segments = 18 / stream_count;
for (i = 0; i < context->stream_count; i++) {
+ if (context->streams[i]->mall_stream_config.type == SUBVP_PHANTOM)
+ continue;
if (context->stream_status[i].plane_count > 0)
plane_segments = stream_segments / context->stream_status[i].plane_count;
else