diff mbox series

[5.12,162/242] drm/amdgpu: Update NV SIMD-per-CU to 2

Message ID	20210715182621.691426884@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Joseph Greathouse <Joseph.Greathouse@amd.com>, Alex Deucher <alexander.deucher@amd.com>, Felix Kuehling <Felix.Kuehling@amd.com> 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> 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
Series	None \| expand [5.12,004/242] drm/amd/display: fix HDCP reset sequence on reinitialize [5.12,007/242] drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be... [5.12,009/242] drm/amdgpu: change the default timeout for kernel compute queues [5.12,010/242] drm/amd/display: fix use_max_lb flag for 420 pixel formats [5.12,012/242] hugetlb: clear huge pte during flush function on mips platform [5.12,013/242] atm: iphase: fix possible use-after-free in ia_module_exit() [5.12,014/242] mISDN: fix possible use-after-free in HFC_cleanup() [5.12,015/242] atm: nicstar: Fix possible use-after-free in nicstar_cleanup() [5.12,018/242] net: mdio: ipq8064: add regmap config to disable REGCACHE [5.12,020/242] reiserfs: add check for invalid 1st journal block [5.12,021/242] drm/virtio: Fix double free on probe failure [5.12,022/242] net: mdio: provide shim implementation of devm_of_mdiobus_register [5.12,024/242] pinctrl: equilibrium: Add missing MODULE_DEVICE_TABLE [5.12,025/242] drm/scheduler: Fix hang when sched_entity released [5.12,026/242] drm/sched: Avoid data corruptions [5.12,027/242] udf: Fix NULL pointer dereference in udf_symlink function [5.12,033/242] igb: fix assignment on big endian machines [5.12,034/242] drm/bridge: cdns: Fix PM reference leak in cdns_dsi_transfer() [5.12,037/242] net/mlx5e: IPsec/rep_tc: Fix rep_tc_update_skb drops IPsec packet [5.12,038/242] net/mlx5: Fix lag port remapping logic [5.12,039/242] drm: rockchip: add missing registers for RK3188 [5.12,043/242] clk: tegra: Fix refcounting of gate clocks [5.12,046/242] virtio-net: Add validation for used length [5.12,047/242] ipv6: use prandom_u32() for ID generation [5.12,049/242] MIPS: ingenic: Select CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER [5.12,051/242] drm/amd/display: Avoid HDCP over-read and corruption [5.12,052/242] drm/amdgpu: remove unsafe optimization to drop preamble ib [5.12,054/242] net: tcp better handling of reordering then loss cases [5.12,056/242] dm space maps: dont reset space map allocation cursor when committing [5.12,060/242] net: bridge: mrp: Update ring transitions. [5.12,061/242] pinctrl: mcp23s08: fix race condition in irq handler [5.12,062/242] ice: set the value of global config lock timeout longer [5.12,065/242] net: mscc: ocelot: check return value after calling platform_get_resource() [5.12,066/242] net: bcmgenet: check return value after calling platform_get_resource() [5.12,067/242] net: mvpp2: check return value after calling platform_get_resource() [5.12,069/242] net: moxa: Use devm_platform_get_and_ioremap_resource() [5.12,073/242] drm/amd/display: Set DISPCLK_MAX_ERRDET_CYCLES to 7 [5.12,076/242] net: phy: realtek: add delay to fix RXC generation issue [5.12,077/242] selftests: Clean forgotten resources as part of cleanup() [5.12,078/242] net: sgi: ioc3-eth: check return value after calling platform_get_resource() [5.12,081/242] selinux: use __GFP_NOWARN with GFP_NOWAIT in the AVC [5.12,084/242] ibmvnic: fix kernel build warnings in build_hdr_descs_arr [5.12,086/242] dm writecache: commit just one block, not a full page [5.12,087/242] wlcore/wl12xx: Fix wl12xx get_mac error if device is in ELP [5.12,089/242] cw1200: add missing MODULE_DEVICE_TABLE [5.12,092/242] net: hsr: dont check sequence number if tag removal is offloaded [5.12,094/242] ice: fix incorrect payload indicator on PTYPE [5.12,096/242] mt76: mt7615: fix fixed-rate tx status reporting [5.12,098/242] net: fix mistake path for netdev_features_strings [5.12,101/242] io_uring: fix false WARN_ONCE [5.12,103/242] drm/amdkfd: Walk through list with dqm lock hold [5.12,105/242] mt76: mt7915: fix IEEE80211_HE_PHY_CAP7_MAX_NC for station mode [5.12,107/242] rtl8xxxu: Fix device info for RTL8192EU devices [5.12,110/242] net: fec: add ndo_select_queue to fix TX bandwidth fluctuations [5.12,112/242] atm: nicstar: register the interrupt handler in the right place [5.12,113/242] vsock: notify server to shutdown when client has pending signal [5.12,114/242] drm/amd/display: Fix edp_bootup_bl_level initialization issue [5.12,115/242] RDMA/rxe: Dont overwrite errno from ib_umem_get() [5.12,116/242] iwlwifi: mvm: dont change band on bound PHY contexts [5.12,118/242] iwlwifi: mvm: fix error print when session protection ends [5.12,119/242] iwlwifi: pcie: free IML DMA memory allocation [5.12,120/242] iwlwifi: pcie: fix context info freeing [5.12,122/242] rtw88: add quirks to disable pci capabilities [5.12,123/242] sfc: avoid double pci_remove of VFs [5.12,124/242] sfc: error code if SRIOV cannot be disabled [5.12,126/242] cfg80211: fix default HE tx bitrate mask in 2G band [5.12,127/242] mac80211: consider per-CPU statistics if present [5.12,129/242] mac80211: Properly WARN on HW scan before restart [5.12,135/242] Bluetooth: btusb: Fixed too many in-token issue for Mediatek Chip. [5.12,136/242] Bluetooth: Fix the HCI to MGMT status conversion table [5.12,137/242] Bluetooth: Fix alt settings for incoming SCO with transparent coding format [5.12,140/242] Bluetooth: L2CAP: Fix invalid access if ECRED Reconfigure fails [5.12,141/242] Bluetooth: L2CAP: Fix invalid access on ECRED Connection response [5.12,143/242] Bluetooth: mgmt: Fix the command returns garbage parameter value [5.12,144/242] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855. [5.12,147/242] bpf: Fix false positive kmemleak report in bpf_ringbuf_area_alloc() [5.12,151/242] MIPS: loongsoon64: Reserve memory below starting pfn to prevent Oops [5.12,152/242] MIPS: set mips32r5 for virt extensions [5.12,156/242] MIPS: MT extensions are not available on MIPS32r1 [5.12,160/242] powerpc/powernv/vas: Release reference to tgid during window close [5.12,162/242] drm/amdgpu: Update NV SIMD-per-CU to 2 [5.12,163/242] drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) [5.12,165/242] drm/amdgpu: fix the hang caused by PCIe link width switch [5.12,167/242] drm/radeon: Call radeon_suspend_kms() in radeon_pci_shutdown() for Loongson64 [5.12,170/242] drm/vc4: hdmi: Prevent clock unbalance [5.12,171/242] drm/dp: Handle zeroed port counts in drm_dp_read_downstream_info() [5.12,172/242] drm/rockchip: dsi: remove extra component_del() call [5.12,175/242] drm/amd/display: Reject non-zero src_y and src_x for video planes [5.12,176/242] drm/ingenic: Fix pixclock rate for 24-bit serial panels [5.12,178/242] drm/msm/mdp4: Fix modifier support enabling [5.12,181/242] drm/ingenic: Switch IPU plane to type OVERLAY [5.12,183/242] mmc: sdhci-acpi: Disable write protect detection on Toshiba Encore 2 WT8-B [5.12,185/242] mmc: core: clear flags before allowing to retune [5.12,186/242] mmc: core: Allow UHS-I voltage switch for SDSC cards if supported [5.12,193/242] ASoC: tegra: Set driver_name=tegra for all machine drivers [5.12,194/242] mwifiex: bring down link before deleting interface [5.12,196/242] qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute [5.12,197/242] ipmi/watchdog: Stop watchdog timer when the current action is none [5.12,198/242] xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype [5.12,200/242] ubifs: Fix races between xattr_{set\|get} and listxattr operations [5.12,201/242] power: supply: ab8500: Fix an old bug [5.12,204/242] lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE [5.12,205/242] selftests/lkdtm: Fix expected text for CR4 pinning [5.12,207/242] lkdtm: Enable DOUBLE_FAULT on all architectures [5.12,208/242] seq_buf: Fix overflow in seq_buf_putmem_hex() [5.12,209/242] rq-qos: fix missed wake-ups in rq_qos_throttle try two [5.12,212/242] ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe [5.12,213/242] coresight: Propagate symlink failure [5.12,216/242] dm writecache: flush origin device when writing and cache is full [5.12,217/242] dm btree remove: assign new_root only when removal succeeds [5.12,221/242] media: subdev: disallow ioctl for saa6588/davinci [5.12,223/242] media: dtv5100: fix control-request directions [5.12,225/242] media: ccs: Fix the op_pll_multiplier address [5.12,228/242] media: rtl28xxu: fix zero-length control request [5.12,229/242] media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K [5.12,231/242] s390/vdso64: add sigreturn,rt_sigreturn and restart_syscall [5.12,232/242] s390/vdso: rename VDSO64_LBASE to VDSO_LBASE [5.12,234/242] s390/signal: switch to using vdso for sigreturn and syscall restart [5.12,235/242] dm writecache: write at least 4k when committing [5.12,238/242] jfs: fix GPF in diFree [5.12,239/242] media: v4l2-core: explicitly clear ioctl input data [5.12,241/242] ext4: fix memory leak in ext4_fill_super

Commit Message

Greg KH July 15, 2021, 6:38 p.m. UTC

From: Joseph Greathouse <Joseph.Greathouse@amd.com>

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 <Joseph.Greathouse@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/amd/include/navi10_enum.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- 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;
 
 /*