Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2509331pxj; Mon, 10 May 2021 04:51:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTfKQ7OyTOTG8lO32YeUvK9G3NQC/5d5IvyViZS9t5m8tvCIBKIns70lAs72zBTc/xYiAc X-Received: by 2002:a05:6402:b88:: with SMTP id cf8mr29079747edb.227.1620647459628; Mon, 10 May 2021 04:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620647459; cv=none; d=google.com; s=arc-20160816; b=XzjwTy21tbnlnDiWJ4XKqZR/hlWdeTL0OY9cB8w1T02Q8oKHEH1x2n7695JqqdqTTh YJx6sveOBH+fht5FgGpR/H1gHB5tdgPeHc7lzaVVpSAamAQfgBLwxbBvOg3VySufEnMx rFF2NO4hrhigAJnD0Ogl/7X8k3PkbBipiBrX0KxaowhvZN7o3ISAiwaZG4AIvfGoQ65O ppjjyHx1JUWCx58Gj47nQ+jiKnHPVj3HIEyCaQ9E8z6fM5f+F7uvpWOjMQs8XQGAj995 xds4QMu5mKy3PF/fv+I+0A7Hja6Th2YaEK0xUClUoi3sTwKGLP3X66A+IoyNAe9UC7Wz R4mw== 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=p0Jq0TmJah8vpAHsZQe5d7F6p4v5fZfJtiyuhLgHGgwp9xhqXWn9bKAOepGVFPoAfZ SEgk3KONd5pZ1vuXWBB+MhxNdqhwuicz4tYFSSkwixoMnQlO1CZuoVZi2FE9s3t9rl33 7kef/LU/j954C2jaKtogMVeqvgRes9qEXgfV8jHvTVJ+Jb35T12mi2SMQmvX8mBrlLml JPopR67XjLsh9iN9WQ7YHdLFOa/cc9YRFaeh/lyERGKYKKBYUhiSb9U3f6lZzvZoQ2oZ 2BL4tYL3OJ2lpXOOPKrYta9JsAoXVPTlEj0GB+xIO9P6YzGW2Bm6RHv3Cn+f2iz6XJdI OIGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=erqXxWKy; 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 o32si12736391eda.316.2021.05.10.04.50.33; Mon, 10 May 2021 04:50:59 -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=erqXxWKy; 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 S236130AbhEJLpB (ORCPT + 99 others); Mon, 10 May 2021 07:45:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231256AbhEJK5r (ORCPT ); Mon, 10 May 2021 06:57:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1631961960; Mon, 10 May 2021 10:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643937; bh=0TbRy66sZ4R1vqsd8auMee9yRY592CCfcWWA3/EZ9Tg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erqXxWKyNl1nj48HGx8nLv7SZzvGDiKyfwV0fQrS/dPcbQJp1Yhm8mONfgenTd76h 5zo6w1lvFkInd7INwQCqPXocRUf2HkBm/+CQagUb0dzaqu5jsiveWKvjFnc7Auwe1W UTd16BwAsiEfA1uEdh7XNPEOYhdjhRHSqgbaNFpY= 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.11 222/342] drm/amdgpu/display: fix memory leak for dimgrey cavefish Date: Mon, 10 May 2021 12:20:12 +0200 Message-Id: <20210510102017.431562162@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@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