Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2538038pxj; Mon, 10 May 2021 05:27:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4S7KI4ZnTEEg83VEsFH8oeQfTCtkGJ6hv0+7Clz4iOF5dmCno3i91MTMg0WP4E2v/cOhM X-Received: by 2002:a6b:ea0e:: with SMTP id m14mr4183073ioc.182.1620649656678; Mon, 10 May 2021 05:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649656; cv=none; d=google.com; s=arc-20160816; b=XvvB7f+mLWVCdJNPXQBowtIJBnLDSH2Akxb+pbDwDLYlf9LyKXK2i6AcwOrs8x6Q0j bCLB7fhmBmGkBWYEXcmCbmX/SgLPdZg9qyXYLo4IkR0MlZq2gofMsqjI/aKJZUZ8Ky2J XfLjqYVSwe65CVG/dYMCBsKiRv7UA5B5uxfE67tl1A/tZNxR3pYLaNmv+D7kdl1WcWL9 GB84MzFqM1wN8RYIx3X8DIlwNRb/d0PgyIfxBrxmJqYg7EtV60VpAAX6pxsGwD6g5QXw aopzyxV9W9N71AhHUzD+OSR2wP6tOZ6htc4/jbgikSGuwmkOlHas+k+YH+b8wgg3TqnR afZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WPMpatw89PPhHhTHN/gzY/WKbeq9yCwVr/VVEgrsmp4=; b=NWAZPeaufnY40Wlh8Jt7kLDCrdPXib4iTQyYgCBNdIfpVqcrVKpWKkAcdtB1PBE1Xb 9XRw6dabe7ljfKFGbCS0lDW7morBYhLusLWxThcRh9SvPOfoyKnPefJfTo6/EPSj4LMO EStdK2FVA4qZKyFiztulQ+Flc/RZwxTgZy0XeI9dyf1OupzbhuPIUY/43fj+H+KT0tdJ sECoCx3OJ0Xc+w/SlIFe3MTSxiNyKy2yKx0YsIEzlQrLKpGEQIpQAgxv1E0C6sqEoP4e Caiovc5qQAc24TYmH+wbXHfGWIHtVw6oLarHeo34BSLDwh21KQ74MSzv9PJaKaOnY3e8 GhVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=au1zegmq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q16si16406228iow.52.2021.05.10.05.27.24; Mon, 10 May 2021 05:27:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=au1zegmq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346136AbhEJM0g (ORCPT + 99 others); Mon, 10 May 2021 08:26:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:46846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237136AbhEJLL0 (ORCPT ); Mon, 10 May 2021 07:11:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 195C1617ED; Mon, 10 May 2021 11:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644849; bh=0TbRy66sZ4R1vqsd8auMee9yRY592CCfcWWA3/EZ9Tg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=au1zegmqDY6/R+uGmeCiTpah6mWM9MPzMBLXYlx3TWBnkry0bEPA8aw6iFGGarYR6 O7ybNLX75UGpuVtiiWk2HecandnsFPk5+Fnpv4i4QncgidkhYc36iCdb32LHikPXN7 qSG6ePhuoiZD2mdCrCNgTN4EUblTxz5ikIVGrJ5I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nirmoy Das , Alex Deucher , Sasha Levin Subject: [PATCH 5.12 249/384] drm/amdgpu/display: fix memory leak for dimgrey cavefish Date: Mon, 10 May 2021 12:20:38 +0200 Message-Id: <20210510102023.094120004@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher [ Upstream commit 42b599732ee1d4ac742760050603fb6046789011 ] We need to clean up the dcn3 clk_mgr. Acked-by: Nirmoy Das Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c index 995ffbbf64e7..1ee27f2f28f1 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c @@ -217,6 +217,9 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { dcn3_clk_mgr_destroy(clk_mgr); } + if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) { + dcn3_clk_mgr_destroy(clk_mgr); + } break; case FAMILY_VGH: -- 2.30.2