From: Alex Hung <[email protected]> [WHAT] dm_test_detect_hides_secondary_tile fails because its synthesized DisplayID tiled display block is 21 bytes, built around an 8-byte topology ID. Upstream commit faaa1e115583 ("drm/edid: fix OOB read in drm_parse_tiled_block()") now ignores tiled blocks shorter than the spec's 22 bytes, so has_tile stays false and detect reports connected.
[HOW] Grow the tiled block to 22 bytes with a 9-byte topology ID, bump the DisplayID section length and recompute its checksum. Cc: Tony Qi <[email protected]> Signed-off-by: Alex Hung <[email protected]> Signed-off-by: Wayne Lin <[email protected]> --- .../display/amdgpu_dm/tests/amdgpu_dm_connector_test.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c index addc407841a2..805c1bc2ad9e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c @@ -4894,7 +4894,8 @@ static void dm_test_detect_no_sink(struct kunit *test) * A 256-byte EDID whose DisplayID extension carries a tiled display * topology block placing this connector at tile location (h=1, v=0), i.e. * a secondary tile. drm_edid_connector_update() parses it to set has_tile - * and the non-origin tile location. + * and the non-origin tile location. The block carries the full 22-byte + * payload (9-byte topology ID); DRM ignores shorter tiled blocks. */ static const u8 dm_test_detect_tile_edid[256] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x10, 0xac, 0x00, 0x00, @@ -4907,10 +4908,10 @@ static const u8 dm_test_detect_tile_edid[256] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc4, 0x70, 0x12, 0x18, 0x00, - 0x00, 0x12, 0x00, 0x15, 0x00, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc4, 0x70, 0x12, 0x19, 0x00, + 0x00, 0x12, 0x00, 0x16, 0x00, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x8d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x8b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 2.43.0
