Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp658085pxv; Thu, 15 Jul 2021 12:41:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgHSVTyooqH7bMt5oXN9LzMlhVOHmbZSeXmaEREAdiBslyTLugoGA/k3u+vwKr8r85aH+H X-Received: by 2002:a17:906:4ad9:: with SMTP id u25mr7264837ejt.174.1626378094109; Thu, 15 Jul 2021 12:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378094; cv=none; d=google.com; s=arc-20160816; b=AHSs78NtlpvMWpS+nLqOdweJ0MPVbCKKh/kMnFjcK0+urFS/EFCFnr0hggoEr8XxVD FFkq5wbaTxW1zkCkTyLs+0LYAjoLlKCd+dDi6A1DZMpXX2AcEIlCacm3H7XwrKheDZiH CtihNaHGecb5TmdM/sEAr5XTyA/prVNDhZxBTSjVwYu0WsDACXBjSHwx6ofdpZKxgCSF cV0gpz89pmA3hThbqwLiORsS/DqrT76R2XlguJvT18YobFSporFsff3B6UEJjFr9WRbv Oqlr85Mwuk+ePJyWrQ3Be9pe9xmNUNgACr8xaFkeO5vA+TMUNe2IpWpjv8ohltT+5Mlf HDkQ== 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=kpI0lqGupc5ub+N8epvU5qYc+chtcmmnPJvtXYAYWqxA1/Bw+qn9NvRXGrKyRl6zRE BGUjiAaE7cMtPSviilxQQsW49uTqNvMewBTY+mNeTaSpXNk8fY9pyWA1p+7dxnwnRRWG EH+uLObQ+swdS0RDgAI1JRWcz/KSaaNr7jvgtgAek5TONA6HuYFeR1z3YPGzXDD6+uHN XHRGmwTy7lkhfepYnCFNnP6IdRApFwz2S0h6gn9pmuZsaAufHl9dX1RnHwOZJNke9pBN jKOb+y7MxggqfMJux3HX/s+TpodhkMSGPBqQKvyVc/v7ptpQ83s8wcb4Ogo7s8w5CNQS THhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EZCwPtMZ; 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 y20si8191884ejr.227.2021.07.15.12.41.11; Thu, 15 Jul 2021 12:41:34 -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=EZCwPtMZ; 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 S1343909AbhGOTnC (ORCPT + 99 others); Thu, 15 Jul 2021 15:43:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:50846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244605AbhGOTO6 (ORCPT ); Thu, 15 Jul 2021 15:14:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 82055613D7; Thu, 15 Jul 2021 19:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376239; bh=eWt/Pgp9ZAHzb7tz++3SmyziJHNnYt8Y3CLGHrP1eRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EZCwPtMZr+VVg1mM/df3AO5Excr2duuFaxoB1p0NZSCEAwQcqyS+a1iIugr6K4IXP UQc48aipzY23MRMGhUEDfZfy08WfyasALv6V6K2TWYkcRWQC8NPpdsCMzw106UnxGO 4jtMU8bj+jb6aPFSxtQ88BDHXp7xsxqRdVrbEZvQ= 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.13 186/266] drm/amdgpu: Update NV SIMD-per-CU to 2 Date: Thu, 15 Jul 2021 20:39:01 +0200 Message-Id: <20210715182644.116970223@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@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; /*