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=unavailable 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 B6C12C32753 for ; Wed, 14 Aug 2019 17:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F12A214DA for ; Wed, 14 Aug 2019 17:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803577; bh=gMyYvyHi4bzkfcwcBzPJRr8p4xBjXOE9TAdzrk2+zuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OGJ5SZic4l787HIOLjvygnvqnMRxNR4BNL4AztxHBFX2hpH7EN5BxSzpetZvX//NG cjEMu0Sn/tfKznIInS7WfsX0ba+YP+KTMzimNSyQXFewvBlShqnDsuD/cYSDAh8aZP j5VOG8CxXjKiQebdGfbrpK2i5nMd5PziLA0dzjyU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728737AbfHNRFB (ORCPT ); Wed, 14 Aug 2019 13:05:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728561AbfHNRFA (ORCPT ); Wed, 14 Aug 2019 13:05: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 17AB82084D; Wed, 14 Aug 2019 17:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802299; bh=gMyYvyHi4bzkfcwcBzPJRr8p4xBjXOE9TAdzrk2+zuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tosbT3N1NXDB7d+irX0pMkkLn+mjjqhXLdmDTid2tuEx7zd2+ZRdNvoz6+5BNS9W2 WaANpKosQSQeG7vGn/bY8XZcE48tUkUO9r2ZrW/ewy8RnlufBXpJYhpqHq2SZxIidM WuvAbBEbuvr8CGXdsJXe5dXzNHs1sBz0Ts6XUyMU= 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 5.2 072/144] drm/amd/display: Only enable audio if speaker allocation exists Date: Wed, 14 Aug 2019 19:00:28 +0200 Message-Id: <20190814165802.868097698@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165759.466811854@linuxfoundation.org> References: <20190814165759.466811854@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 b2525ab8a95f6..b459ce056b609 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -2019,7 +2019,7 @@ enum dc_status resource_map_pool_resources( /* TODO: Add check if ASIC support and EDID audio */ if (!stream->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