Re: [PATCH 02/02 v2] drm/amd/display: add cyan_skillfish display support
On 2021-09-30 10:12, Alex Deucher wrote: > On Thu, Sep 30, 2021 at 10:10 AM Alex Deucher wrote: >> >> On Wed, Sep 29, 2021 at 10:00 PM Alex Deucher wrote: >>> >>> On Wed, Sep 29, 2021 at 7:23 PM Mike Lothian wrote: Hi This patch is causing a failure for me when building with clang: Enable DCN201 support in DC (DRM_AMD_DC_DCN201) [Y/n/?] (NEW) y Enable HDCP support in DC (DRM_AMD_DC_HDCP) [Y/n/?] y AMD DC support for Southern Islands ASICs (DRM_AMD_DC_SI) [N/y/?] n Enable secure display support (DRM_AMD_SECURE_DISPLAY) [Y/n/?] y DESCEND objtool CALLscripts/atomic/check-atomics.sh CALLscripts/checksyscalls.sh CHK include/generated/compile.h UPD kernel/config_data GZIPkernel/config_data.gz CC kernel/configs.o AR kernel/built-in.a CC drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/clk_mgr.o CC drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o clang-12: error: unknown argument: '-mpreferred-stack-boundary=4' make[4]: *** [scripts/Makefile.build:278: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o] Error 1 make[4]: *** Waiting for unfinished jobs make[3]: *** [scripts/Makefile.build:540: drivers/gpu/drm/amd/amdgpu] Error 2 make[2]: *** [scripts/Makefile.build:540: drivers/gpu/drm] Error 2 make[1]: *** [scripts/Makefile.build:540: drivers/gpu] Error 2 make: *** [Makefile:1868: drivers] Error 2 >>> >>> The Makefiles for the new stuff added probably need to be fixed up for >>> clang like the other Makefiles. I can take a look tomorrow. >> >> I don't see anything off in the Makefiles. Can you try with a clean tree? >> > > Nevermind, Harry found it. patch on the list. > I found a clang build error with dcn201_resources.o, not in dcn30_optc.o. Not sure why you're seeing this with dcn30_optc.o. Harry > Alex >
Re: [PATCH 02/02 v2] drm/amd/display: add cyan_skillfish display support
On Thu, Sep 30, 2021 at 10:10 AM Alex Deucher wrote: > > On Wed, Sep 29, 2021 at 10:00 PM Alex Deucher wrote: > > > > On Wed, Sep 29, 2021 at 7:23 PM Mike Lothian wrote: > > > > > > Hi > > > > > > This patch is causing a failure for me when building with clang: > > > > > > > > > Enable DCN201 support in DC (DRM_AMD_DC_DCN201) [Y/n/?] (NEW) y > > > Enable HDCP support in DC (DRM_AMD_DC_HDCP) [Y/n/?] y > > > AMD DC support for Southern Islands ASICs (DRM_AMD_DC_SI) [N/y/?] n > > > Enable secure display support (DRM_AMD_SECURE_DISPLAY) [Y/n/?] y > > > DESCEND objtool > > > CALLscripts/atomic/check-atomics.sh > > > CALLscripts/checksyscalls.sh > > > CHK include/generated/compile.h > > > UPD kernel/config_data > > > GZIPkernel/config_data.gz > > > CC kernel/configs.o > > > AR kernel/built-in.a > > > CC drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/clk_mgr.o > > > CC drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o > > > clang-12: error: unknown argument: '-mpreferred-stack-boundary=4' > > > make[4]: *** [scripts/Makefile.build:278: > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o] Error 1 > > > make[4]: *** Waiting for unfinished jobs > > > make[3]: *** [scripts/Makefile.build:540: drivers/gpu/drm/amd/amdgpu] > > > Error 2 > > > make[2]: *** [scripts/Makefile.build:540: drivers/gpu/drm] Error 2 > > > make[1]: *** [scripts/Makefile.build:540: drivers/gpu] Error 2 > > > make: *** [Makefile:1868: drivers] Error 2 > > > > The Makefiles for the new stuff added probably need to be fixed up for > > clang like the other Makefiles. I can take a look tomorrow. > > I don't see anything off in the Makefiles. Can you try with a clean tree? > Nevermind, Harry found it. patch on the list. Alex
Re: [PATCH 02/02 v2] drm/amd/display: add cyan_skillfish display support
On Wed, Sep 29, 2021 at 10:00 PM Alex Deucher wrote: > > On Wed, Sep 29, 2021 at 7:23 PM Mike Lothian wrote: > > > > Hi > > > > This patch is causing a failure for me when building with clang: > > > > > > Enable DCN201 support in DC (DRM_AMD_DC_DCN201) [Y/n/?] (NEW) y > > Enable HDCP support in DC (DRM_AMD_DC_HDCP) [Y/n/?] y > > AMD DC support for Southern Islands ASICs (DRM_AMD_DC_SI) [N/y/?] n > > Enable secure display support (DRM_AMD_SECURE_DISPLAY) [Y/n/?] y > > DESCEND objtool > > CALLscripts/atomic/check-atomics.sh > > CALLscripts/checksyscalls.sh > > CHK include/generated/compile.h > > UPD kernel/config_data > > GZIPkernel/config_data.gz > > CC kernel/configs.o > > AR kernel/built-in.a > > CC drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/clk_mgr.o > > CC drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o > > clang-12: error: unknown argument: '-mpreferred-stack-boundary=4' > > make[4]: *** [scripts/Makefile.build:278: > > drivers/gpu/drm/amd/amdgpu/../display/dc/dcn30/dcn30_optc.o] Error 1 > > make[4]: *** Waiting for unfinished jobs > > make[3]: *** [scripts/Makefile.build:540: drivers/gpu/drm/amd/amdgpu] Error > > 2 > > make[2]: *** [scripts/Makefile.build:540: drivers/gpu/drm] Error 2 > > make[1]: *** [scripts/Makefile.build:540: drivers/gpu] Error 2 > > make: *** [Makefile:1868: drivers] Error 2 > > The Makefiles for the new stuff added probably need to be fixed up for > clang like the other Makefiles. I can take a look tomorrow. I don't see anything off in the Makefiles. Can you try with a clean tree? Alex
Re: [PATCH 02/02 v2] drm/amd/display: add cyan_skillfish display support
On Mon, Sep 27, 2021 at 5:16 PM Liu, Zhan wrote: > > [Public] > > [Why] > add display related cyan_skillfish files in. > > makefile controlled by CONFIG_DRM_AMD_DC_DCN201 flag. > > Signed-off-by: Charlene Liu > Signed-off-by: Zhan Liu > Reviewed-by: Charlene Liu > Acked-by: Jun Lei > --- > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 1d6cc93..0c669e4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1968,6 +1968,9 @@ > case CHIP_VANGOGH: > chip_name = "vangogh"; > break; > + case CHIP_CYAN_SKILLFISH: > + chip_name = "cyan_skillfish"; > + break; > case CHIP_YELLOW_CARP: > chip_name = "yellow_carp"; > break; Sorry I missed this before. This change is unnecessary. there is no gpu_info firmware for cyan skillfish. Please drop this hunk. With that fixed: Acked-by: Alex Deucher Alex
