Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp5911466ybf; Thu, 5 Mar 2020 09:19:53 -0800 (PST) X-Google-Smtp-Source: ADFU+vu+AvYeN8GTU9cS5rRZ9x63JTFug2gon4rJWDSZc6FnQlU0PZ14XcGo/hISUsnH3X8DIe3k X-Received: by 2002:aca:5501:: with SMTP id j1mr89542oib.92.1583428793141; Thu, 05 Mar 2020 09:19:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583428793; cv=none; d=google.com; s=arc-20160816; b=MErYFO9jAwFpzrauG3DdhnwCDiQ73pBxizOWMjNiQKeRcdL3d7cobw1ffbiAMM4yKb zSNJRYBe4Njrcj4/B9jk1vL+wJNQY/6H977fJ5yg3zgFmZqO57B6NqIbMYbEZnYjgNgR 7jx1aGV/XqGrn4i7+IzXzzNftP4VMxJ4RGocTkLtTSU1ZHuXH4/I9xU/ScG8qM8hFFUu 6qUcJfluL+M5TqQrtuFK2YVC+58XFQcsdOuG7IswbfPuU3bZ+AA4XRsoD7hcUQSNVFpW 7JO2+hNPANLrNNNYNVZ5xn0LBJZ7kRAVfLd13A0N1AwowcAWZqUyDn+nbhLgdW7A4URX tAhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=I1W8gmY3H87M+JbaSWZOHJLI1RMksLiXQCFEu/DaLHo=; b=hwFlNDxtvSNWKituJsZx4TtcSHbizdqcvTHVKF1FR5HWGBUNga189iJEVL/p8KwFFw fKB2wnT//1eLkIIfv7Jxk9sUBC0EJ7/LFMbE2ukdWcw/asFZO2nBPCnN9twf99tmSOlp 6GdAig22bR+wzLDIHBnyYa2IkPrL3aJ7Wytk3lAbz05Cr4bIVPj8ynehcdR92sOO7gMv iit5v0X0VkVlUFzfYu0fmnAxioeJp2A/Cag1eSSBzOB0mARxEqO9UyfEO0OIFj/XN0MU cy+f2Lpz5/EY9BcsrqdhJL6cTZbo4qN++8G9tiX6PwmKCM7pXAeioOfvC+o5QGl+Ku1w 66Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UvVQeF9I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10si3726466oth.325.2020.03.05.09.19.41; Thu, 05 Mar 2020 09:19:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UvVQeF9I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727958AbgCERTZ (ORCPT + 99 others); Thu, 5 Mar 2020 12:19:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:41692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727946AbgCERPH (ORCPT ); Thu, 5 Mar 2020 12:15:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 760B621744; Thu, 5 Mar 2020 17:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428506; bh=5+O+YWwnsvBINmW4iAXC6psifakgha+pK7uZe9OAMiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UvVQeF9IMDOlakia11hIqh2+QXBJs30CmO+dkNki5q18x8CmaHQyIyxpT9HXxyfQU p6nVLCNGlHr3tWdffbfCzVPx5SL1fSCHQu4Y103mc0CPvuIyCwWEwDvy+LN0D4H4DB au4aO5h7w8BwbUQqVk5rQdxy4kZSyG0hDlPlPOGw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Monk Liu , Hawking Zhang , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 36/58] drm/amdgpu: fix memory leak during TDR test(v2) Date: Thu, 5 Mar 2020 12:13:57 -0500 Message-Id: <20200305171420.29595-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171420.29595-1-sashal@kernel.org> References: <20200305171420.29595-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Monk Liu [ Upstream commit 4829f89855f1d3a3d8014e74cceab51b421503db ] fix system memory leak v2: fix coding style Signed-off-by: Monk Liu Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index c5257ae3188a3..0922d9cd858a0 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -988,8 +988,12 @@ static int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu) struct smu_11_0_max_sustainable_clocks *max_sustainable_clocks; int ret = 0; - max_sustainable_clocks = kzalloc(sizeof(struct smu_11_0_max_sustainable_clocks), + if (!smu->smu_table.max_sustainable_clocks) + max_sustainable_clocks = kzalloc(sizeof(struct smu_11_0_max_sustainable_clocks), GFP_KERNEL); + else + max_sustainable_clocks = smu->smu_table.max_sustainable_clocks; + smu->smu_table.max_sustainable_clocks = (void *)max_sustainable_clocks; max_sustainable_clocks->uclock = smu->smu_table.boot_values.uclk / 100; -- 2.20.1