From: Dave Airlie <airlied@redhat.com>
Date: Wed, 26 Feb 2025 06:41:44 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-6.15-2025-02-21' of https://gitlab.freedesktop.org/agd5f... 
X-Git-Tag: v6.15-rc1~120^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=425b8481750abce45fa4aeecf6c32152cadbfa15;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'amd-drm-next-6.15-2025-02-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-6.15-2025-02-21:

amdgpu:
- Add OEM i2c support for RGB lights, etc.
- Add support for GC 11.5.3
- Add support for GC 11.5.2
- Add support for SDMA 6.1.3
- Add support for NBIO 7.11.2
- Add support for NBIO 7.9.1
- Add support for MMHUB 3.3.2
- Add support for MMHUB 1.8.1
- Add support for SMU 14.0.5
- Add support for SMUIO 13.0.11
- Add support for PSP 14.0.5
- Add support for UMC 12.5.0
- Add support for DCN 3.6.0
- JPEG 4.0.3 updates
- Add dynamic workload profile switching for GC 10-12
- support larger vbios sizes
- GC 9.5.0 updates
- SMU 13.0.12 updates
- SMU 13.0.6 updates
- IP discovery updates
- GC 10 queue reset updates
- DCN 4.0.1 updates
- UHBR link rate fixes
- Aborted suspend fix
- Mark gttsize parameter as deprecated
- GC 10 cleaner shader updates
- PSR-SU fixes
- Clean up PM4 headers
- Cursor fixes
- Enable devcoredump for JPEG
- Misc cleanups
- Runpm cleanups
- MES updates
- GC 9 gfxoff fixes
- Vbios fetching cleanups
- Documentation updates
- Update secondary plane handling
- DML2 updates
- SDMA fixes for MI
- Cleaner shader fixes for GC 11/12
- ACA updates
- Initial JPEG queue reset support
- RAS updates
- Initial RAS CPER support
- DCN/DCE panic screen handling cleanup
- BT2020 fixes
- SR-IOV fixes

amdkfd:
- synchronize pasid values between KGD and KFD
- Misc cleanups
- Improve GTT/VRAM handling for APUs
- Topology updates
- Fix user queue validation on GC 7/8

UAPI:
- Enable "Broadcast RGB" drm property
- Add INFO IOCTL query for virtualization mode
  Proposed userspace:
  https://github.com/ROCm/amdsmi/commit/e663bed7d6b3df79f5959e73981749b1f22ec698

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

425b8481750abce45fa4aeecf6c32152cadbfa15
diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 1ea40696c9555,8672c0c3c5db3..16e4eb474eece
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -7476,9 -7536,11 +7536,12 @@@ enum drm_mode_status amdgpu_dm_connecto
  {
  	int result = MODE_ERROR;
  	struct dc_sink *dc_sink;
 +	struct drm_display_mode *test_mode;
  	/* TODO: Unhardcode stream count */
  	struct dc_stream_state *stream;
+ 	/* we always have an amdgpu_dm_connector here since we got
+ 	 * here via the amdgpu_dm_connector_helper_funcs
+ 	 */
  	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
  
  	if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
@@@ -7501,16 -7563,11 +7564,16 @@@
  		goto fail;
  	}
  
 -	drm_mode_set_crtcinfo(mode, 0);
 +	test_mode = drm_mode_duplicate(connector->dev, mode);
 +	if (!test_mode)
 +		goto fail;
 +
 +	drm_mode_set_crtcinfo(test_mode, 0);
  
- 	stream = create_validate_stream_for_sink(aconnector, test_mode,
 -	stream = create_validate_stream_for_sink(connector, mode,
++	stream = create_validate_stream_for_sink(connector, test_mode,
  						 to_dm_connector_state(connector->state),
  						 NULL);
 +	drm_mode_destroy(connector->dev, test_mode);
  	if (stream) {
  		dc_stream_release(stream);
  		result = MODE_OK;