Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp634731pxv; Thu, 15 Jul 2021 12:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5PcQCsUEMM88K7ah85O/JsilqLXmB/XsEc5mM8p5cnsu5sqFBA/LPsEoTP9FAnzkaJlWA X-Received: by 2002:a17:907:2079:: with SMTP id qp25mr7053693ejb.207.1626375884525; Thu, 15 Jul 2021 12:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626375884; cv=none; d=google.com; s=arc-20160816; b=wa9p4Js7pZ1gp5XFi0IriCqiOMdePez08CAA42lh/87u3f0/DjYgdquvdF4usQQzfm b1gUFqUDxQSSO3I9hF1XI7D4D8uRPH7f2hL/xSDbiLhdDw95+RZV/h/QLzycaVkcwV75 H6WjC5yfHbHY2Kpe4IEyesu0w5x2bMGlXEfnXrfOXytyZZIIbuvpGJo7Kp0DBgvlHios X7tvnbi+BKmmmuYLGNpxSJPwxXN0gMBgsicLV4pLLRtEySUeFV9uNwquFVk7LBoy0Nni u+qxM1OyhG6e/DSiRskgWaGPJm45Ubq0N+A0s27rfrBSmrrgUO2asXQf7wFSlKNy536O l2gQ== 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=P/mlfveLXrnxDIb+XWOmHWT4wW4E8423VRIBXAxYisE=; b=wnQGlNe8BcZC/cv1HjVYm6xUyxhK1HfbpbRdRDxXfQY3BchJ7T14jmvAlbGHONF27J HJOtC365oeN+Dp7tXPxkVnXFayOr5lr4lSHZzhsayGscKNNjHAEGkAjxzOsjWMkkwisH u3+uUY7q1X6MKohMKricwMtwF9viyveeGzrfDXq6Yre5y9A0QyyYgsbhx0tKuQLKfAOX QZOl8HXLVp3dZN5v2/j2mV3+m/3j7c3JCy4uWYc0/0tC8Ggoa1ERIgQ8x1ny3XB+Xp6A cKczt/hPIcW+z1LvTsSxqqcf3szX/OXRpVj/VT3+xtvZsgCrt5fv7FGlfuQH+rRnbCxs yWQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yEc676T7; 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 z14si6705047edr.61.2021.07.15.12.04.19; Thu, 15 Jul 2021 12:04:44 -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=yEc676T7; 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 S238531AbhGOTF3 (ORCPT + 99 others); Thu, 15 Jul 2021 15:05:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:60090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240103AbhGOSzg (ORCPT ); Thu, 15 Jul 2021 14:55:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 510F1613D6; Thu, 15 Jul 2021 18:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375162; bh=eWt/Pgp9ZAHzb7tz++3SmyziJHNnYt8Y3CLGHrP1eRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yEc676T75dKNE905aikovNP/L/m3R4xiETk76YoUTdasjHI9DAc+RX2FiyonCBA0N ojXKfEqmtXIzaWdxJl9cdd6dhrvS/XveZbJU1fUC/VCg6nxePOB8tcnh4PANfXzUdZ piM4rTdxSNKhkX6KjTHEBoHpqY2Vuga43Y7fdf9o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joseph Greathouse , Alex Deucher , Felix Kuehling Subject: [PATCH 5.10 149/215] drm/amdgpu: Update NV SIMD-per-CU to 2 Date: Thu, 15 Jul 2021 20:38:41 +0200 Message-Id: <20210715182625.971165379@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182558.381078833@linuxfoundation.org> References: <20210715182558.381078833@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: Joseph Greathouse commit aa6158112645aae514982ad8d56df64428fcf203 upstream. Navi series GPUs have 2 SIMDs per CU (and then 2 CUs per WGP). The NV enum headers incorrectly listed this as 4, which later meant we were incorrectly reporting the number of SIMDs in the HSA topology. This could cause problems down the line for user-space applications that want to launch a fixed amount of work to each SIMD. Signed-off-by: Joseph Greathouse Reviewed-by: Alex Deucher Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/include/navi10_enum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/include/navi10_enum.h +++ b/drivers/gpu/drm/amd/include/navi10_enum.h @@ -430,7 +430,7 @@ ARRAY_2D_DEPTH */ typedef enum ENUM_NUM_SIMD_PER_CU { -NUM_SIMD_PER_CU = 0x00000004, +NUM_SIMD_PER_CU = 0x00000002, } ENUM_NUM_SIMD_PER_CU; /*