[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 0484e05d048b66d01d1f3c1d2306010bb57d8738
WARNING: Author mismatch between patch and upstream commit:
Backport author: <jianqi.ren.cn@xxxxxxxxxxxxx>
Commit author: Sohaib Nadeem <sohaib.nadeem@xxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.11.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 71783d1ff652)
6.1.y | Not found
Note: The patch differs from the upstream commit:
---
1: 0484e05d048b6 ! 1: b87ee3f3696bd drm/amd/display: fixed integer types and null check locations
@@ Metadata
## Commit message ##
drm/amd/display: fixed integer types and null check locations
+ [ Upstream commit 0484e05d048b66d01d1f3c1d2306010bb57d8738 ]
+
[why]:
issues fixed:
- comparison with wider integer type in loop condition which can cause
@@ Commit message
Signed-off-by: Sohaib Nadeem <sohaib.nadeem@xxxxxxx>
Tested-by: Daniel Wheeler <daniel.wheeler@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
+ Signed-off-by: Jianqi Ren <jianqi.ren.cn@xxxxxxxxxxxxx>
## drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c ##
@@ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c: static enum bp_result get_firmware_info_v3_2(
@@ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c: static enum bp_result get_in
info->gpu_cap_info =
le32_to_cpu(info_v2_2->gpucapinfo);
/*
-
- ## drivers/gpu/drm/amd/display/dc/link/link_validation.c ##
-@@ drivers/gpu/drm/amd/display/dc/link/link_validation.c: bool link_validate_dpia_bandwidth(const struct dc_stream_state *stream, const un
- struct dc_link *dpia_link[MAX_DPIA_NUM] = {0};
- int num_dpias = 0;
-
-- for (uint8_t i = 0; i < num_streams; ++i) {
-+ for (unsigned int i = 0; i < num_streams; ++i) {
- if (stream[i].signal == SIGNAL_TYPE_DISPLAY_PORT) {
- /* new dpia sst stream, check whether it exceeds max dpia */
- if (num_dpias >= MAX_DPIA_NUM)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
