From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Dec 2023 02:11:41 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-6.8-2023-12-01' of https://gitlab.freedesktop.org/agd5f/linux... 
X-Git-Tag: v6.8-rc1~21^2~25
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5edfd7d94b0310b74136b666551f1d23711ed445;p=linux-block.git

Merge tag 'amd-drm-next-6.8-2023-12-01' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.8-2023-12-01:

amdgpu:
- Add new 64 bit sequence number infrastructure.
  This will ultimately be used for user queue synchronization.
- GPUVM updates
- Misc code cleanups
- RAS updates
- DCN 3.5 updates
- Rework PCIe link speed handling
- Document GPU reset types
- DMUB fixes
- eDP fixes
- NBIO 7.9 updates
- NBIO 7.11 updates
- SubVP updates
- DCN 3.1.4 fixes
- ABM fixes
- AGP aperture fix
- DCN 3.1.5 fix
- Fix some potential error path memory leaks
- Enable PCIe PMEs
- Add XGMI, PCIe state dumping for aqua vanjaram
- GFX11 golden register updates
- Misc display fixes

amdkfd:
- Migrate TLB flushing logic to amdgpu
- Trap handler fixes
- Fix restore workers handling on suspend and reset
- Fix possible memory leak in pqm_uninit()

radeon:
- Fix some possible overflows in command buffer checking
- Check for errors in ring_lock

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231201181743.5313-1-alexander.deucher@amd.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

5edfd7d94b0310b74136b666551f1d23711ed445
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 3608d520b227,a6995688d7ad..b599efda3b19
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -1643,8 -1649,8 +1650,8 @@@ enum dc_status dm_dp_mst_is_port_suppor
  	} else {
  		/* check if mode could be supported within full_pbn */
  		bpp = convert_dc_color_depth_into_bpc(stream->timing.display_color_depth) * 3;
 -		pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp, false);
 +		pbn = drm_dp_calc_pbn_mode(stream->timing.pix_clk_100hz / 10, bpp << 4);
- 		if (pbn > full_pbn)
+ 		if (pbn > aconnector->mst_output_port->full_pbn)
  			return DC_FAIL_BANDWIDTH_VALIDATE;
  	}