Commit 4652ae7a authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Rename DCN config to FP 



[Why & How]
The only reason we have the DCN config is for
floating point support. Rename it to make that
clear and (hopefully) avoid misuse of the config
in the future.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c186c13e

drivers/gpu/drm/amd/display/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config DRM_AMD_DC 
	depends on BROKEN || !CC_IS_CLANG || X86_64 || SPARC64 || ARM64

	select SND_HDA_COMPONENT if SND_HDA_CORE

	# !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752

	select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))

	select DRM_AMD_DC_FP if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON && !CC_IS_CLANG))

	help

	  Choose this option if you want to use the new display engine

	  support for AMDGPU. This adds required support for Vega and
@@ -20,10 +20,10 @@ config DRM_AMD_DC 
	  panic on most architectures.  We'll revert this when the following bug report

	  has been resolved: https://github.com/llvm/llvm-project/issues/41896.



config DRM_AMD_DC_DCN

config DRM_AMD_DC_FP

	def_bool n

	help

	  Raven, Navi, and newer family support for display engine

	  Floating point support, required for DCN-based SoCs



config DRM_AMD_DC_SI

	bool "AMD DC support for Southern Islands ASICs"
@@ -44,7 +44,7 @@ config DEBUG_KERNEL_DC 
config DRM_AMD_SECURE_DISPLAY

        bool "Enable secure display support"

        depends on DEBUG_FS

        depends on DRM_AMD_DC_DCN

        depends on DRM_AMD_DC_FP

        help

            Choose this option if you want to

            support secure display

drivers/gpu/drm/amd/display/amdgpu_dm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ AMDGPUDM = \ 
	amdgpu_dm_mst_types.o \

	amdgpu_dm_color.o



ifdef CONFIG_DRM_AMD_DC_DCN

ifdef CONFIG_DRM_AMD_DC_FP

AMDGPUDM += dc_fpu.o

endif

drivers/gpu/drm/amd/display/dc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


DC_LIBS = basics bios dml clk_mgr dce gpio irq link virtual dsc



ifdef CONFIG_DRM_AMD_DC_DCN

ifdef CONFIG_DRM_AMD_DC_FP



KCOV_INSTRUMENT := n

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

+1 −1
Original line number Diff line number Diff line
@@ -2064,7 +2064,7 @@ static enum bp_result bios_parser_get_encoder_cap_info( 
	if (!info)

		return BP_RESULT_BADINPUT;



#if defined(CONFIG_DRM_AMD_DC_DCN)

#if defined(CONFIG_DRM_AMD_DC_FP)

	/* encoder cap record not available in v1_5 */

	if (bp->object_info_tbl.revision.minor == 5)

		return BP_RESULT_NORECORD;

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ CLK_MGR_DCE120 = dce120_clk_mgr.o 
AMD_DAL_CLK_MGR_DCE120 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dce120/,$(CLK_MGR_DCE120))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCE120)

ifdef CONFIG_DRM_AMD_DC_DCN

ifdef CONFIG_DRM_AMD_DC_FP

###############################################################################

# DCN10

###############################################################################