diff options
| author |   jsg <jsg@openbsd.org> | 2019-08-17 08:20:59 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-08-17 08:20:59 +0000 |
| commit | 166ab68bddb4bf74c1c9f3fa8f0c9500f02914ee (patch) | |
| tree | 6fb01770abebff76c385175d20436f84dde8f856 | |
| parent | drm/amd/display: Fix dc_create failure handling and 666 color depths (diff) | |
| download | wireguard-openbsd-166ab68bddb4bf74c1c9f3fa8f0c9500f02914ee.tar.xz wireguard-openbsd-166ab68bddb4bf74c1c9f3fa8f0c9500f02914ee.zip | |
drm/amd/display: Only enable audio if speaker allocation exists
From Alvin Lee
f9420bfa29f9ece0b02a5435ae95f1a48bc97723 in linux 4.19.y/4.19.67
6ac25e6d5b2fbf251e9fa2f4131d42c815b43867 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/core/dc_resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c index 60ccfa833ab..53c70eea750 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c @@ -1956,7 +1956,7 @@ enum dc_status resource_map_pool_resources( /* TODO: Add check if ASIC support and EDID audio */ if (!stream->sink->converter_disable_audio && dc_is_audio_capable_signal(pipe_ctx->stream->signal) && - stream->audio_info.mode_count) { + stream->audio_info.mode_count && stream->audio_info.flags.all) { pipe_ctx->stream_res.audio = find_first_free_audio( &context->res_ctx, pool, pipe_ctx->stream_res.stream_enc->id); |