Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4653185pxj; Wed, 12 May 2021 10:07:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn90nnpj+ChEu9XfjFbz6XRMsTfoqmu9KyYouXKhwirsKEzdBvibbdERt/7dUenIq9Roky X-Received: by 2002:a17:906:2f91:: with SMTP id w17mr19156156eji.443.1620839237960; Wed, 12 May 2021 10:07:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620839237; cv=none; d=google.com; s=arc-20160816; b=l/RwZZilBHVbHGZCe82RJBw1nzrvIz3hAM3PrtcIi2ROy4yLx1FBD8ys+XPTS5wEcX JvammpNJsEaeIMr0aKdAJTLZyQcAl0UZnBXscozFKyN5smdSDG24YkaPzPwD3IyLgWRd GYAoC/YVyIE09Q68L5c6trlxAMasOtcD7qvzzH3i4e003sd7eE6bMxCU8tF51gSRHXfx Xv4LMrysfNZRw38eblsJiGAOfY8lrHDIhdLyv7ynMd9MCaalUcVTXFRwqYoPOZ6zy1SA N/0QNS2AyQcgd2uEluEILo3uhLwA9lmaG3djw1vEBDjKkpwMEGtmOU4DEyC+Y9v7tKV0 RHbg== 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=53pTvSOn5IU1c4pOlrMhkyIVg+ZZqDE0ph9b1eYdflY=; b=0FloNJfhyi0Qv9gx0SZ5xqTJjHP1DK0dBDEgMb9x7+1kIx+BURzhExYZls6qgBwsaz BK6sMBfH3wcVBeKn+U48eml3tfXCCO9pF3xCGZlZFnkCF/2KV6Jz4c7Q7InJv4ESaVw1 47e4WEzqqeskMSXxYZVN33A17KfumRQVKTTzjcRf2Qo1cbcJ7KSlzDithH8FsQ9XWL3+ u4FzKhn2icJGyjxp7GqWHaH/399fUiHblQULvNSNpJU/qyJDkbq3XGagpi/M6yEayXta VrSzv7a5x6z6iuuClZna3r8Ky1yYVZdxanTv3K9Ha7JXatNN62Qb3W7+n1O0DZgq1ImI GtuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=02kABhb0; 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 c5si260391edq.169.2021.05.12.10.06.54; Wed, 12 May 2021 10:07:17 -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=02kABhb0; 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 S1343929AbhELRAQ (ORCPT + 99 others); Wed, 12 May 2021 13:00:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:36062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237929AbhELP4y (ORCPT ); Wed, 12 May 2021 11:56:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4AE5061433; Wed, 12 May 2021 15:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620833333; bh=NMclS5wjHRBtVyRdUkVEaRAvKEfqBw3aJqBzkZT6iwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=02kABhb01CEXyS+bhqTYmTSD5XOO5YEO8b2HxGJtkYVaMD2o/B8RdWhi6ulMVyNyy j0eO9F9UFDmAkYKzco7CVWp4tnwIuXnopdZTM5/zM8mIgJWoXXj2G99sHtD9yW2u1T NcrvUJb0xZBr87cOcfmORAlogm3dHMrIGcG4H1Vs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evan Quan , Alex Deucher Subject: [PATCH 5.11 073/601] drm/amdgpu: add new MC firmware for Polaris12 32bit ASIC Date: Wed, 12 May 2021 16:42:30 +0200 Message-Id: <20210512144830.230383038@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@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: Evan Quan commit c83c4e1912446db697a120eb30126cd80cbf6349 upstream. Polaris12 32bit ASIC needs a special MC firmware. Signed-off-by: Evan Quan Reviewed-by: Alex Deucher 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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -59,6 +59,7 @@ 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/polaris12_32_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris11_k_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris10_k_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris12_k_mc.bin"); @@ -243,10 +244,16 @@ static int gmc_v8_0_init_microcode(struc chip_name = "polaris10"; break; case CHIP_POLARIS12: - if (ASICID_IS_P23(adev->pdev->device, adev->pdev->revision)) + if (ASICID_IS_P23(adev->pdev->device, adev->pdev->revision)) { chip_name = "polaris12_k"; - else - chip_name = "polaris12"; + } else { + WREG32(mmMC_SEQ_IO_DEBUG_INDEX, ixMC_IO_DEBUG_UP_159); + /* Polaris12 32bit ASIC needs a special MC firmware */ + if (RREG32(mmMC_SEQ_IO_DEBUG_DATA) == 0x05b4dc40) + chip_name = "polaris12_32"; + else + chip_name = "polaris12"; + } break; case CHIP_FIJI: case CHIP_CARRIZO: