Re: [PATCH 5.15/6.1] drm/amd/display: Pass non-null to dcn20_validate_apply_pipe_split_flags

[Sasha Levin <sashal@kernel.org>]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 5559598742fb4538e4c51c48ef70563c49c2af23

WARNING: Author mismatch between patch and upstream commit:
Backport author: Daniil Dulov <d.dulov@aladdin.ru>
Commit author: Alex Hung <alex.hung@amd.com>

Status in newer kernel trees:
6.15.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 39a580cd1539)

Note: The patch differs from the upstream commit:
---
1:  5559598742fb ! 1:  011d5796b713 drm/amd/display: Pass non-null to dcn20_validate_apply_pipe_split_flags
    @@ Metadata
      ## Commit message ##
         drm/amd/display: Pass non-null to dcn20_validate_apply_pipe_split_flags
     
    +    commit 5559598742fb4538e4c51c48ef70563c49c2af23 upstream.
    +
         [WHAT & HOW]
         "dcn20_validate_apply_pipe_split_flags" dereferences merge, and thus it
         cannot be a null pointer. Let's pass a valid pointer to avoid null
    @@ Commit message
         Signed-off-by: Alex Hung <alex.hung@amd.com>
         Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
         Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    +    [ Daniil: dcn20 and dcn21 were moved from drivers/gpu/drm/amd/display/dc to
    +      drivers/gpu/drm/amd/display/dc/resource since commit
    +      8b8eed05a1c6 ("drm/amd/display: Refactor resource into component directory").
    +      The path is changed accordingly to apply the patch on 5.15.y and 6.1.y. ]
    +    Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
     
    - ## drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c ##
    -@@ drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c: bool dcn20_fast_validate_bw(
    + ## drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c ##
    +@@ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c: bool dcn20_fast_validate_bw(
      {
      	bool out = false;
      	int split[MAX_PIPES] = { 0 };
    @@ drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c: bool dcn20_fast_
      	int pipe_cnt, i, pipe_idx, vlevel;
      
      	ASSERT(pipes);
    -@@ drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c: bool dcn20_fast_validate_bw(
    +@@ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c: bool dcn20_fast_validate_bw(
      	if (vlevel > context->bw_ctx.dml.soc.num_states)
      		goto validate_fail;
      
    @@ drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c: bool dcn20_fast_
      	/*initialize pipe_just_split_from to invalid idx*/
      	for (i = 0; i < MAX_PIPES; i++)
     
    - ## drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c ##
    -@@ drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c: bool dcn21_fast_validate_bw(struct dc *dc,
    + ## drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c ##
    +@@ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c: bool dcn21_fast_validate_bw(struct dc *dc,
      {
      	bool out = false;
      	int split[MAX_PIPES] = { 0 };
    @@ drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c: bool dcn21_fast_
      	int pipe_cnt, i, pipe_idx, vlevel;
      
      	ASSERT(pipes);
    -@@ drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c: bool dcn21_fast_validate_bw(struct dc *dc,
    +@@ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c: bool dcn21_fast_validate_bw(struct dc *dc,
      			goto validate_fail;
      	}
      

---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| origin/linux-5.15.y       | Success     | Success    |
| origin/linux-6.1.y        | Success     | Success    |