Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp712750pxv; Thu, 15 Jul 2021 14:11:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycosmHSAfOzUFWZg+CdiLyb8ijh2NnHJwYU2UBPzUDnXtqjS/mVa3VgeZdIt/Ugj2alaif X-Received: by 2002:a17:906:190c:: with SMTP id a12mr7698382eje.37.1626383480934; Thu, 15 Jul 2021 14:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626383480; cv=none; d=google.com; s=arc-20160816; b=1FoUhZ90jamHhoIlfywa+E9gEBNKKVUvgBKqeKvkRbkbHYFgrBFly4Kd+x9TYLDzZC iS05hTOXMae2+HF/ANorFPG4+yE+nMH2fln7/bxVDchmWwbn6T060L6Ff8JgR5hflywV JZaJIKdP5kWKWDXHdtFAGfWGu/qhz9DvtqSgzb09OQBRIrZUNJiQ5hy8+E1LkUuFq768 /py/WnLqo4OAoAPyeufZ3rXsiiq7/mAyn+vy3MendjoEZbWcujxDmddei0RpHCztiy+B jmkrfHOMiZcUAc3ZNOZpfLyhyZ9feH2sptIHDmp5Y+zA1gVfEd72jDz7w+pjjP9WP4Pl EvIQ== 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=yN6eFzQOiPuSZCwC00lukBSjkNyAH8YXjrgasJkXqoG6gwAnOrDqGxmmWGGTQ+bDXV bkWYeGs/f5KymQ7z/LDALKFXUX89XZkWKeZnjG+j28sOD1Sr86KcYhpH4X906uU/9C6r ezLt4A6um+P+6duQoxSrGFHMjfloFCBNqWvtGtVCf5iWgG9uG6T3Y/VV3vfxapR8UMdH 03uOVLU9dtbehIi5lHJfyPluD/jYkX9hWCWrsgu+zYh5SivqJ/Wv43YUjVnc8cl0cCU9 amMFUsbr+F/ujSrR+452O7bIXdqOltsFV2QUu7iWCeCpU+5EvJLlUuhJmLUvfqPLJzfe o08A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XXVRJg3I; 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 d15si8964676ejc.258.2021.07.15.14.10.58; Thu, 15 Jul 2021 14:11:20 -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=XXVRJg3I; 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 S244944AbhGOTVG (ORCPT + 99 others); Thu, 15 Jul 2021 15:21:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:39758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242693AbhGOTFO (ORCPT ); Thu, 15 Jul 2021 15:05:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D8ACC613D7; Thu, 15 Jul 2021 19:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375701; bh=eWt/Pgp9ZAHzb7tz++3SmyziJHNnYt8Y3CLGHrP1eRs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXVRJg3IzSTcYy9V0dFXa01uDhwid3oXpLjLN93mg9S3kmHUPPWDa0Lbh6qvHzdFc HX336Xck5B44opBcovs2dbLNVCioh0/nA7BSM4g8TufBSTa+Zu7QpPe5cM/jnp9aPv rMwO0UEE7Vv3Fux6/zMYVh/YAk3xLtLQ+izOazX8= 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.12 162/242] drm/amdgpu: Update NV SIMD-per-CU to 2 Date: Thu, 15 Jul 2021 20:38:44 +0200 Message-Id: <20210715182621.691426884@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182551.731989182@linuxfoundation.org> References: <20210715182551.731989182@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; /*