Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp901024imu; Tue, 11 Dec 2018 09:16:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/VRkwZd6YJ5FEXrkCcBC1C8zZU31JLnSgcbUkQK/0FobrFoOz8tGRUND3vG3m7hXJG5pDUc X-Received: by 2002:a17:902:8d8e:: with SMTP id v14mr16704661plo.133.1544548605439; Tue, 11 Dec 2018 09:16:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544548605; cv=none; d=google.com; s=arc-20160816; b=UKXze/IgztqPBP+CJ3vrfnJzABUL2AyogEisB3z/jLOoy5RKtCeLdqybQUJ3MzV4sy E4/NWcaQXYakNuXcQQ5uLzZrQ1ulTPZ+OVUbYMsqUGlnm3OqXwD7YDl9jkDBQveJpFHm FLYfP5i+U3vwOmHukRKo6atWt2ueJGps/nFCnwWV4elApgeRVSdctV+QHfrujPhGB3Lb wDhYutx72OCyqL5puQ3KasNESrgCE86ai7AkKwRvnxhaQtbDsPbEEv8KXWHfuqnSFPN+ SWJPt9v8bHWLfJvc2Qu1o7ss4Lgg8RhYX45OlOl1UJGTjcLr1qEP656YP+MbRqKhfuA8 Ficg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CzrQYJvzjgMYX8WWGzBjORtaLmiy+Gwt64eMfAPiI7A=; b=IJIOzJO1urqAhBMTnhYP46ez1VKdUUAx/gF5U7Ijc1ViwdI8b1AdQcJ0ALxTywieCL JHNSbJap6lnzdy0AzBg40SyE2B7Y1U6K73PhD9IHM28uuXE2zGTlNkldwjARKag/Uvj3 q90kpDthOL/EDPgb33wPPAXz6fhlv5aPAZoDFF9x2nVqa9407C05/7b2k+18xyqyu7TN lc7RJXX4ELvlFjutJ8YzMrBKzk4ep1Mb5+LvpvihNTcQ5I7zo2s6V9Jy5aUQQT5SbIqr YJ+v3mEIpwYmR+GlD56zrI1Hr5FzeyNPi1xtxs+KPhZrQwxjyBZK0IEcvMbOA+eqBWwV Il+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="oLEZaKe/"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d32si13155278pla.136.2018.12.11.09.16.30; Tue, 11 Dec 2018 09:16:45 -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="oLEZaKe/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729906AbeLKPxR (ORCPT + 99 others); Tue, 11 Dec 2018 10:53:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:41928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729894AbeLKPxP (ORCPT ); Tue, 11 Dec 2018 10:53:15 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 B61D820855; Tue, 11 Dec 2018 15:53:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543594; bh=KoktMSn2MPJxFf09iWL9M2HN3eKJuVo6QyNCmhwziNQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLEZaKe/axUBjzK7M9dQlGRmjl68YdI+Qxc+Ldp6wgbT6J7OXfmeniKQ0Q6vAi+VJ ey/Ytts4qHiNM90+2GajYDDDbeFHEUZBbqYNMYQbgk/ZHrxgxGcW0mI/MRIzUr+nvA n1ptJZgPs5U2cmzk5KbfbV1E66gQg5LD+F72yASY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Junwei Zhang , Alex Deucher Subject: [PATCH 4.14 57/67] drm/amdgpu/gmc8: update MC firmware for polaris Date: Tue, 11 Dec 2018 16:41:57 +0100 Message-Id: <20181211151633.266259722@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151630.378216233@linuxfoundation.org> References: <20181211151630.378216233@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit a81a7c9c9ea3042ab02d66ac35def74abf091c15 upstream. Some variants require different MC firmware images. Acked-by: Christian König Reviewed-by: Junwei Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -52,6 +52,8 @@ MODULE_FIRMWARE("amdgpu/tonga_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris11_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris10_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris12_mc.bin"); +MODULE_FIRMWARE("amdgpu/polaris11_k_mc.bin"); +MODULE_FIRMWARE("amdgpu/polaris10_k_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris12_k_mc.bin"); static const u32 golden_settings_tonga_a11[] = @@ -220,22 +222,39 @@ static int gmc_v8_0_init_microcode(struc chip_name = "tonga"; break; case CHIP_POLARIS11: - chip_name = "polaris11"; + if (((adev->pdev->device == 0x67ef) && + ((adev->pdev->revision == 0xe0) || + (adev->pdev->revision == 0xe5))) || + ((adev->pdev->device == 0x67ff) && + ((adev->pdev->revision == 0xcf) || + (adev->pdev->revision == 0xef) || + (adev->pdev->revision == 0xff)))) + chip_name = "polaris11_k"; + else if ((adev->pdev->device == 0x67ef) && + (adev->pdev->revision == 0xe2)) + chip_name = "polaris11_k"; + else + chip_name = "polaris11"; break; case CHIP_POLARIS10: - chip_name = "polaris10"; + if ((adev->pdev->device == 0x67df) && + ((adev->pdev->revision == 0xe1) || + (adev->pdev->revision == 0xf7))) + chip_name = "polaris10_k"; + else + chip_name = "polaris10"; break; case CHIP_POLARIS12: - chip_name = "polaris12"; if (((adev->pdev->device == 0x6987) && ((adev->pdev->revision == 0xc0) || (adev->pdev->revision == 0xc3))) || ((adev->pdev->device == 0x6981) && ((adev->pdev->revision == 0x00) || (adev->pdev->revision == 0x01) || - (adev->pdev->revision == 0x10)))) { + (adev->pdev->revision == 0x10)))) chip_name = "polaris12_k"; - } + else + chip_name = "polaris12"; break; case CHIP_FIJI: case CHIP_CARRIZO: