From patchwork Wed Jan 13 15:24:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 363513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3168DC433E0 for ; Wed, 13 Jan 2021 15:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E317E23382 for ; Wed, 13 Jan 2021 15:24:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbhAMPY5 (ORCPT ); Wed, 13 Jan 2021 10:24:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbhAMPY5 (ORCPT ); Wed, 13 Jan 2021 10:24:57 -0500 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7330C061786 for ; Wed, 13 Jan 2021 07:24:16 -0800 (PST) Received: by mail-qt1-x835.google.com with SMTP id c14so1314728qtn.0 for ; Wed, 13 Jan 2021 07:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G6oe8P4Cun9SiL0t1L9XuoXsNwtXDQqzA/hUUXLRRy8=; b=k0FptLBrQ0lIrlPQ5SAAtOS3q1vC7iY4EO1FME5ovzI4Bi6paNTwjqWQDOFVoEFfCa ljMbMdpecfgmwjh1gQpDo9qiTS7edrD024lHSpkspbXWJAacFpTebbl465b0lANcy/ek CakqOxpW9opeRKq65OtWwmTw7Lxe/7wgNQpWiagvQhTj9uOPYDDYcQ4hsnNlbzMxIyr3 IG+rpgPXS6eWAvzZ2L4Kc/0aTe6wKaBL5C+vTn9fLRbOpSNM2K37tG722PiLtLfRQIjo IAgpMvbOmBHrWUkYypk/S6MBYUzt5mSNDMJZAww9LxHDOZiqSSBfqAa3XKvX30SmaC8D L7UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G6oe8P4Cun9SiL0t1L9XuoXsNwtXDQqzA/hUUXLRRy8=; b=X5y4ZfWKgPlFHhiTbBPFAQDYVWzQ6r06F8Dwyxc1BE27hWns/ZwikMsPJ6cPo2NiB3 QagdT0k8ky6WbatO4SupfzLFnBsLKvKxEl6nbURe6/hCWZNv3ePoKi/8r5DxkIMgDeZJ ir5vMqsclAsOa4iGfN5lbf/P6SWi6Vuu7zI734ymEmGunXC4ZElv7tGrPvQVlPLLXnMw O3/FXy+bSGS8s0GHj11VGBWh76HIxCNcMfLPXVgYeWM9JPUgT0lq/yrJD15CmBRZHOEH 8/h5E09xFeEo6DCL1IysFBqlLqXG2CT33W+xuZnBuNvgdgIaqB8QiFycB89KjwcHg+Dd Twhg== X-Gm-Message-State: AOAM532YHYmiLlUZB4phCnOGz0EoX9tA9eGfRSy4i4U7uS3yuJnp/TDf lctMwHHO0m7h50PfgiL3+OyuYJDvRzY= X-Google-Smtp-Source: ABdhPJxAugt1k2AHmUlmKMWOdManzJZpZwnQ2YiX+5vGVLEkJjOfkdz9Yi1d5QhWSVWb7Euy2alyBA== X-Received: by 2002:ac8:6d05:: with SMTP id o5mr2862002qtt.6.1610551455992; Wed, 13 Jan 2021 07:24:15 -0800 (PST) Received: from localhost.localdomain ([192.161.78.241]) by smtp.gmail.com with ESMTPSA id i3sm1159827qkd.119.2021.01.13.07.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 07:24:15 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org Cc: Prike Liang , Alex Deucher , Huang Rui , stable@vger.kernel.org Subject: [PATCH 1/2] drm/amdgpu: add green_sardine device id (v2) Date: Wed, 13 Jan 2021 10:24:03 -0500 Message-Id: <20210113152404.1307212-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Prike Liang Add green_sardine PCI id support and map it to renoir asic type. v2: add apu flag Signed-off-by: Prike Liang Reviewed-by: Alex Deucher Reviewed-by: Huang Rui Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.10.x --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index cac2724e7615..6a402d8b5573 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1085,6 +1085,7 @@ static const struct pci_device_id pciidlist[] = { /* Renoir */ {0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, + {0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, /* Navi12 */ {0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12}, From patchwork Wed Jan 13 15:24:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 362764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8AA0C433E6 for ; Wed, 13 Jan 2021 15:24:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85C6C23382 for ; Wed, 13 Jan 2021 15:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726960AbhAMPY6 (ORCPT ); Wed, 13 Jan 2021 10:24:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbhAMPY6 (ORCPT ); Wed, 13 Jan 2021 10:24:58 -0500 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4F8FC061794 for ; Wed, 13 Jan 2021 07:24:17 -0800 (PST) Received: by mail-qt1-x82f.google.com with SMTP id z9so1302886qtn.4 for ; Wed, 13 Jan 2021 07:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c38Z3i7wyqZ2AoBI7tMokj5G+FD83lVpzKyX+ujthQE=; b=FK2GjKpSfz0g7Vf79H4YtLu6Lbmp5KXq3ElRfpnYA3K3pD79Rm008OTv0sr2R7zdxD f4dVCpUo2L0BKcw/2Z/sOmL8ziLQFcuLN+NVkLeswOfva4jBPLrrk1DrEd0miCxFNNue wIk+Q7sFxYcIiUyyxg2rnTqYs5wvv1AOmwo8Xg2mpq/VegOj6ah/bhZNPm1aLG9aq3dD 4mYYBhUE208bIAV8VxQLaBAVVQzEsxAiM9NVWYWKai/vNvcNfWlEjewAjE2O+CQqiECJ JlKFlkvhH8Ed7IeGJQZDi8ZpjTt9UO7crKN6sCVHtXKlw6OYeMfCXBCVbuUXHd/UobSu HoTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c38Z3i7wyqZ2AoBI7tMokj5G+FD83lVpzKyX+ujthQE=; b=i8Vf8pfZ4DOWbS+8sMfHdQCAQjr+Z2Sfiacso/oIJ3puu4ZLdvMEqh4b+r3UuLz7lY 6gg8hN78q9DAAHg4CVT8elqotIVVwJpBRe9UVtLTSfjiuDGxED9NcO4jHLGgueXro6KI Ob2IHZGcNivBO9qSN2hHQUq67hxnjcKoTSNipNz9Ijmoy1WX8lKnhLOtm26kI7Ai16ms yQ+tCbvGvcSBC0AhgL4GCFG2P2tzoaVoIl0vpYn21M+PXh2LMbptxnfJUzmcrxcp+0mg i7QSd7q5y4Xsczjs5BGEp4318f63GWGfbNklSJ2nmuew0nxQWM9G9nrrnChW5gqT8HSh i/Ew== X-Gm-Message-State: AOAM533DDVI6gj9AhTLYmfn/yIQzq9Bx0Hkc+ioDRNagSWB5vzlhjQZo x66baqLzQ1sdxdlRJ98TYTo= X-Google-Smtp-Source: ABdhPJxog0RY4/gPFi5VrfiXtsBLniSRb6PidBca+m21BM7BmqTgRdl+TKedjJGIlD2fLztsz/qYlA== X-Received: by 2002:ac8:2a8f:: with SMTP id b15mr2685491qta.33.1610551456984; Wed, 13 Jan 2021 07:24:16 -0800 (PST) Received: from localhost.localdomain ([192.161.78.241]) by smtp.gmail.com with ESMTPSA id i3sm1159827qkd.119.2021.01.13.07.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 07:24:16 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org Cc: mengwang , Huang Rui , Alex Deucher , stable@vger.kernel.org Subject: [PATCH 2/2] drm/amdgpu: add new device id for Renior Date: Wed, 13 Jan 2021 10:24:04 -0500 Message-Id: <20210113152404.1307212-2-alexander.deucher@amd.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210113152404.1307212-1-alexander.deucher@amd.com> References: <20210113152404.1307212-1-alexander.deucher@amd.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: mengwang add DID 0x164C into pciidlist under CHIP_RENOIR family. Signed-off-by: mengwang Reviewed-by: Huang Rui Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 5.10.x --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 6a402d8b5573..3f0f3ce2611c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1086,6 +1086,7 @@ static const struct pci_device_id pciidlist[] = { /* Renoir */ {0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, {0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, + {0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, /* Navi12 */ {0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12}, diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 9a25accd48a3..2396be16c28e 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -1204,7 +1204,8 @@ static int soc15_common_early_init(void *handle) break; case CHIP_RENOIR: adev->asic_funcs = &soc15_asic_funcs; - if (adev->pdev->device == 0x1636) + if ((adev->pdev->device == 0x1636) || + (adev->pdev->device == 0x164c)) adev->apu_flags |= AMD_APU_IS_RENOIR; else adev->apu_flags |= AMD_APU_IS_GREEN_SARDINE;