From patchwork Mon May 2 20:00:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8995291 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF78E9F30C for ; Mon, 2 May 2016 20:01:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2B6A20279 for ; Mon, 2 May 2016 20:01:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5C4F620259 for ; Mon, 2 May 2016 20:01:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A25786E638; Mon, 2 May 2016 20:01:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x229.google.com (mail-qk0-x229.google.com [IPv6:2607:f8b0:400d:c09::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E8EE6E637 for ; Mon, 2 May 2016 20:01:26 +0000 (UTC) Received: by mail-qk0-x229.google.com with SMTP id r184so79805856qkc.1 for ; Mon, 02 May 2016 13:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1M1BTZYKoFp4fkLAH7ynU3/7cHjPgZuLatB31X+Ad1Q=; b=VpVC/YD6x7tF8NVmSFOaGA9kTqVePBB9MBofPJy2MSw9S+er4FWWcqwYJogtCifL/7 rqF6PAmFd7wC426RZ9bdG9SoMp1r6hX+5ICUh2/YzkCOGs1+QZmV9Cy9yCbkkU3uUHpk cXLibgnlOu9Ldg6MuXX3/EAc8f/2hjjcZo3JcZp/nsZw3dWwKcaUVFldJWS1zw/e3F8v wQKah7s9UZ/U+3ulhuaQyvywcXrmlzhg5MUz88sokqCscy/6qz3jbFHlDbXxXEEvqLxn sfjsOLQ8x61yQ5Y8FI20r1akFT7zMq1hVWZrFJAI4mZscuhvbMt7esxO6kRgaUv8ytpW gBDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1M1BTZYKoFp4fkLAH7ynU3/7cHjPgZuLatB31X+Ad1Q=; b=Zo0UOKQomDIrdYTSycaGV9jMZNUQ5MNhQthk0i/TlxCkiCtpbrT6fN0cvWD1ioxqbD LcvWZEZElbbPc8LkCSPHfvdBC2hUsee6o7Q88eHNDdh23K68owMqQhpx6EEZE0WnUrSp csr1fGZmrhLi3qHbfYgytpnKtoj6f/MEHXa1LG5VrIydSTgWI+cgrl91xM/07BFf9Hc2 Px3faBKbvffEj473QTWm4uo17auBDoVNiRuk/O4mDwcv99/Gz+23D6OAXlNOL+C8nJWC g+E+dnROfHXCbm501juvhfsb9kZvpBZfXc+CBfS0VPrpMSRvqv30jfnP38DUHKgA26ui /2rw== X-Gm-Message-State: AOPr4FUsdwjesn31A3u+vQq74dnl8wdYOqpObLYPpp6/QXovc7IojMRy42325mmg6LbEeQ== X-Received: by 10.55.18.42 with SMTP id c42mr13393592qkh.158.1462219285250; Mon, 02 May 2016 13:01:25 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id x189sm9587609qhb.43.2016.05.02.13.01.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 May 2016 13:01:24 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: fix memory leak in CGS (FW info) Date: Mon, 2 May 2016 16:00:45 -0400 Message-Id: <1462219259-29806-33-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462219259-29806-1-git-send-email-alexander.deucher@amd.com> References: <1462219259-29806-1-git-send-email-alexander.deucher@amd.com> Cc: Mykola Lysenko X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mykola Lysenko Previously requested FW pointer should not be overwritten on a subsequent call. Reviewed-by: Alex Deucher Signed-off-by: Mykola Lysenko --- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 70 +++++++++++++++++---------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 837cdd2..490464e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -735,42 +735,44 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, const uint8_t *src; const struct smc_firmware_header_v1_0 *hdr; - switch (adev->asic_type) { - case CHIP_TONGA: - strcpy(fw_name, "amdgpu/tonga_smc.bin"); - break; - case CHIP_FIJI: - strcpy(fw_name, "amdgpu/fiji_smc.bin"); - break; - case CHIP_POLARIS11: - if (type == CGS_UCODE_ID_SMU) - strcpy(fw_name, "amdgpu/polaris11_smc.bin"); - else if (type == CGS_UCODE_ID_SMU_SK) - strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin"); - break; - case CHIP_POLARIS10: - if (type == CGS_UCODE_ID_SMU) - strcpy(fw_name, "amdgpu/polaris10_smc.bin"); - else if (type == CGS_UCODE_ID_SMU_SK) - strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin"); - break; - default: - DRM_ERROR("SMC firmware not supported\n"); - return -EINVAL; - } + if (!adev->pm.fw) { + switch (adev->asic_type) { + case CHIP_TONGA: + strcpy(fw_name, "amdgpu/tonga_smc.bin"); + break; + case CHIP_FIJI: + strcpy(fw_name, "amdgpu/fiji_smc.bin"); + break; + case CHIP_POLARIS11: + if (type == CGS_UCODE_ID_SMU) + strcpy(fw_name, "amdgpu/polaris11_smc.bin"); + else if (type == CGS_UCODE_ID_SMU_SK) + strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin"); + break; + case CHIP_POLARIS10: + if (type == CGS_UCODE_ID_SMU) + strcpy(fw_name, "amdgpu/polaris10_smc.bin"); + else if (type == CGS_UCODE_ID_SMU_SK) + strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin"); + break; + default: + DRM_ERROR("SMC firmware not supported\n"); + return -EINVAL; + } - err = request_firmware(&adev->pm.fw, fw_name, adev->dev); - if (err) { - DRM_ERROR("Failed to request firmware\n"); - return err; - } + err = request_firmware(&adev->pm.fw, fw_name, adev->dev); + if (err) { + DRM_ERROR("Failed to request firmware\n"); + return err; + } - err = amdgpu_ucode_validate(adev->pm.fw); - if (err) { - DRM_ERROR("Failed to load firmware \"%s\"", fw_name); - release_firmware(adev->pm.fw); - adev->pm.fw = NULL; - return err; + err = amdgpu_ucode_validate(adev->pm.fw); + if (err) { + DRM_ERROR("Failed to load firmware \"%s\"", fw_name); + release_firmware(adev->pm.fw); + adev->pm.fw = NULL; + return err; + } } hdr = (const struct smc_firmware_header_v1_0 *) adev->pm.fw->data;