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 DD1E3C32753 for ; Wed, 14 Aug 2019 17:26:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A82B1214DA for ; Wed, 14 Aug 2019 17:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803575; bh=L7r9ww7SAYVEu2l/41sseOOYt9QNi2ZZXDy86XLK94A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0EQr+VY4UDbuV3xqDbx8/IsM0kIC/Y2Jwkg20rSVVQMYG62we7ktb/W26gujdp8Am pv/wU4YzljMd6zyeAflOoffRgdYFMkNv3Z+W7J4QvcMbywdSCK/UOGo8fHs0rny8fn YI9rA029JjY9dH1m/kh8sFYkJncQfAgRcE/KFUrc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729369AbfHNRFI (ORCPT ); Wed, 14 Aug 2019 13:05:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:53940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729347AbfHNRFC (ORCPT ); Wed, 14 Aug 2019 13:05:02 -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 99CA6208C2; Wed, 14 Aug 2019 17:05:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802302; bh=L7r9ww7SAYVEu2l/41sseOOYt9QNi2ZZXDy86XLK94A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fasj9VBRk/9zmQ3IEfmGAFeIq0gunTsdJlQL/YArD/ZTEz55XOulFbwOlXb022bOk t/R7fl1GlGP+xIr+aXRsFMJUsdt+moKmcyMfWzcA8cfTEhrAujozcP7OcWEQcVgYUV SzXCKdhXezO3Al4divuO0UX8PC3KjKRp98mSnibE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tai Man , Joshua Aberback , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.2 073/144] drm/amd/display: Increase size of audios array Date: Wed, 14 Aug 2019 19:00:29 +0200 Message-Id: <20190814165802.912559590@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 7352193a33dfc9b69ba3bf6a8caea925b96243b1 ] [Why] The audios array defined in "struct resource_pool" is only 6 (MAX_PIPES) but the max number of audio devices (num_audio) is 7. In some projects, it will run out of audios array. [How] Incraese the audios array size to 7. Signed-off-by: Tai Man Reviewed-by: Joshua Aberback Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h index 6f5ab05d64677..6f0cc718fbd75 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h +++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h @@ -169,7 +169,7 @@ struct resource_pool { struct clock_source *clock_sources[MAX_CLOCK_SOURCES]; unsigned int clk_src_count; - struct audio *audios[MAX_PIPES]; + struct audio *audios[MAX_AUDIOS]; unsigned int audio_count; struct audio_support audio_support; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h index 4c8e2c6fb6dbc..72266efd826cf 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h @@ -34,6 +34,7 @@ * Data types shared between different Virtual HW blocks ******************************************************************************/ +#define MAX_AUDIOS 7 #define MAX_PIPES 6 struct gamma_curve { -- 2.20.1