From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 352DDC32753 for ; Wed, 14 Aug 2019 17:11:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 017B3208C2 for ; Wed, 14 Aug 2019 17:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802669; bh=BLwjPdtqgfNhqbOrTefGQ/E12D/Jkr6BQ+YzX/qBtxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HeaLUX4TE2bnep85IolSrMmZlj+V6C91rJ8Dnee4/41jSiR4RDHdMTfQb8Mjde+BQ tAFyImM2SGvTzUYz2aZ6IWM1KrvbTCITzmpVQDnD/xYYm/VcT9bhSQjQWVrxL9+mI7 oHDSuRbY/0tcqox2ybH/AhKoBciTd6jUBvCamB78= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730556AbfHNRLI (ORCPT ); Wed, 14 Aug 2019 13:11:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:34100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729956AbfHNRLA (ORCPT ); Wed, 14 Aug 2019 13:11:00 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DEC24208C2; Wed, 14 Aug 2019 17:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802659; bh=BLwjPdtqgfNhqbOrTefGQ/E12D/Jkr6BQ+YzX/qBtxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rUu+zpGEM1/0oPFBhblEoUsJdOevC0ZZ+hp1JyU4FyuMtsrJ/Sy8d102u+OmsKtx3 ve7AeAXq1WoMi83g+QQ8VTmXkXEc0DhuvE4E5slTlZPWgAPWwGMbFqdbafYiK4XF+T CcUpK2F2IFWYEJJflev3gM/jv3jxmAgxpeJp6Pg4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alvin Lee , Jun Lei , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 4.19 42/91] drm/amd/display: Only enable audio if speaker allocation exists Date: Wed, 14 Aug 2019 19:01:05 +0200 Message-Id: <20190814165751.409847047@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165748.991235624@linuxfoundation.org> References: <20190814165748.991235624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 6ac25e6d5b2fbf251e9fa2f4131d42c815b43867 ] [Why] In dm_helpers_parse_edid_caps, there is a corner case where no speakers can be allocated even though the audio mode count is greater than 0. Enabling audio when no speaker allocations exists can cause issues in the video stream. [How] Add a check to not enable audio unless one or more speaker allocations exist (since doing this can cause issues in the video stream). Signed-off-by: Alvin Lee Reviewed-by: Jun Lei Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 19a951e5818ac..f0d68aa7c8fcc 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/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); -- 2.20.1