Re: [PATCH 5.15 000/262] 5.15.27-rc1 review

From: Holger Hoffstätte
Date: Mon Mar 07 2022 - 08:41:20 EST


On 2022-03-07 11:44, Holger Hoffstätte wrote:
On 2022-03-07 10:15, Greg Kroah-Hartman wrote:
This is the start of the stable review cycle for the 5.15.27 release.
There are 262 patches in this series, all will be posted as a response
to this one.  If anyone has any issues with these being applied, please
let me know.

CC [M]  drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn301/dcn301_fpu.o
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn301/dcn301_fpu.c:30:10: fatal error: dml/dcn20/dcn20_fpu.h: No such file or directory
   30 | #include "dml/dcn20/dcn20_fpu.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

Culprit is "drm-amd-display-move-fpu-associated-dcn301-code-to-d.patch"

Looking over the git history of the dml/dnc20 directory I think the correct fix would
be to also apply upstream commit ee37341199c61558b73113659695c90bf4736eb2 aka
"drm/amd/display: Re-arrange FPU code structure for dcn2x"

CC'ing Qingqing Zhuo for confirmation.

I can confirm that applying a modified ee37341199c6 fixes the issue. \o/
The hunk that refers to drivers/gpu/drm/amd/display/dc/dcn201 needs to be removed,
since that directory (support for "cyan_skillfish") does not exist in 5.15.x.

cheers
Holger