diff options
| author | Alex Hung <alex.hung@amd.com> | 2023-12-01 06:25:21 -0700 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-12-06 15:22:34 -0500 |
| commit | b6411638c026fde33046f5515a5a7d37af1da146 (patch) | |
| tree | 4439668ed00312e14164a39bdbecabe02499fee3 /drivers/gpu/drm/amd/display/dc | |
| parent | 08a32addf17317b9fac55be9b31275cbf6e41fb7 (diff) | |
| download | linux-stable-b6411638c026fde33046f5515a5a7d37af1da146.tar.gz linux-stable-b6411638c026fde33046f5515a5a7d37af1da146.tar.bz2 linux-stable-b6411638c026fde33046f5515a5a7d37af1da146.zip | |
drm/amd/display: Avoid virtual stream encoder if not explicitly requested
Virtual stream encoder should not be a free match for thunderbolt or
usbc, and thus should be avoided.
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Alex Hung <alex.hung@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/resource/dcn10/dcn10_resource.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c index af1b31f4e69a..d08d10969251 100644 --- a/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c @@ -1250,7 +1250,10 @@ struct stream_encoder *dcn10_find_first_free_match_stream_enc_for_link( /* Store first available for MST second display * in daisy chain use case */ - j = i; + + if (pool->stream_enc[i]->id != ENGINE_ID_VIRTUAL) + j = i; + if (link->ep_type == DISPLAY_ENDPOINT_PHY && pool->stream_enc[i]->id == link->link_enc->preferred_engine) return pool->stream_enc[i]; |