[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: adb4998f4928a17d91be054218a902ba9f8c1f93
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Not found
Note: The patch differs from the upstream commit:
---
1: adb4998f4928a ! 1: 0e5ffb81ed4e1 drm/amd/display: Reduce accessing remote DPCD overhead
@@ Commit message
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
(cherry picked from commit 4a9a918545455a5979c6232fcf61ed3d8f0db3ae)
Cc: stable@xxxxxxxxxxxxxxx
+ (cherry picked from commit adb4998f4928a17d91be054218a902ba9f8c1f93)
+ Signed-off-by: Wayne Lin <Wayne.Lin@xxxxxxx>
## drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h ##
@@ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h: struct amdgpu_dm_connector {
@@ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c: amdgpu_dm_mst_conne
+static inline void
+amdgpu_dm_mst_reset_mst_connector_setting(struct amdgpu_dm_connector *aconnector)
+{
-+ aconnector->drm_edid = NULL;
++ aconnector->edid = NULL;
+ aconnector->dsc_aux = NULL;
+ aconnector->mst_output_port->passthrough_aux = NULL;
+ aconnector->mst_local_bw = 0;
@@ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c: amdgpu_dm_mst_conne
dc_sink_release(dc_sink);
aconnector->dc_sink = NULL;
-- aconnector->drm_edid = NULL;
+- aconnector->edid = NULL;
- aconnector->dsc_aux = NULL;
- port->passthrough_aux = NULL;
+ amdgpu_dm_mst_reset_mst_connector_setting(aconnector);
@@ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c: dm_dp_mst_detect(st
dc_sink_release(aconnector->dc_sink);
aconnector->dc_sink = NULL;
-- aconnector->drm_edid = NULL;
+- aconnector->edid = NULL;
- aconnector->dsc_aux = NULL;
- port->passthrough_aux = NULL;
+ amdgpu_dm_mst_reset_mst_connector_setting(aconnector);
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
