Revert "drm/amdgpu/display: Replace CONFIG_DRM_AMD_DC_DCN1_0 with CONFIG_X86"
Subsystems (3)
[email protected]
maintainerPATCH 1/2 Revert "drm/amdgpu/display: Replace CONFIG_DRM_AMD_DC_DCN1_0 with CONFIG_X86"
From: "Leo (Sunpeng) Li" <[email protected]>
This reverts commit 8624c3c4dbfe24fc6740687236a2e196f5f4bfb0.
We need CONFIG_DRM_AMD_DC_DCN1_0 to guard code that is using fp math.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/display/Kconfig | 8 ++++++++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++---- drivers/gpu/drm/amd/display/dc/Makefile | 2 +- .../drm/amd/display/dc/bios/command_table_helper2.c | 2 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +++--- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 12 ++++++------ drivers/gpu/drm/amd/display/dc/dc.h | 2 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +++--- .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 8 ++++---- drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +++--- .../gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 20 ++++++++++---------- .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 ++-- drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 ++-- drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 4 ++-- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +++--- drivers/gpu/drm/amd/display/dc/irq/Makefile | 2 +- drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- drivers/gpu/drm/amd/display/dc/os_types.h | 2 +- 26 files changed, 64 insertions(+), 56 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2287,7 +2287,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)case CHIP_VEGA10 :case CHIP_VEGA12 :case CHIP_VEGA20 : -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN :#endif return amdgpu_dc !=0 ;
drivers/gpu/drm/amd/display/Kconfig +8 -0
@@ -9,6 +9,14 @@ config DRM_AMD_DC support for AMDGPU. This adds required support for Vega and Raven ASICs. +config DRM_AMD_DC_DCN1_0 + bool "DCN 1.0 Raven family" + depends on DRM_AMD_DC && X86 + default y + help + Choose this option if you want to have + RV family for display engine + config DEBUG_KERNEL_DC bool "Enable kgdb break in DC" depends on DRM_AMD_DC
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -4
@@ -58,7 +58,7 @@#include <drm/drm_fb_helper.h> #include <drm/drm_edid.h> -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "ivsrcid/irqsrcs_dcn_1_0.h" #include "dcn/dcn_1_0_offset.h"
@@ -1188,7 +1188,7 @@ static int dce110_register_irq_handlers(struct amdgpu_device *adev)return 0 ; } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )/* Register IRQ sources and initialize IRQ callbacks */ static int dcn10_register_irq_handlers (struct amdgpu_device *adev) {
@@ -1528,7 +1528,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) goto fail; }break ; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN :if (dcn10_register_irq_handlers (dm->adev)) {DRM_ERROR ("DM: Failed to initialize IRQ\n" );
@@ -1758,7 +1758,7 @@ static int dm_early_init(void *handle) adev->mode_info.num_dig =6 ; adev->mode_info.plane_type = dm_plane_type_default;break ; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN : adev->mode_info.num_crtc =4 ; adev->mode_info.num_hpd =4 ;
drivers/gpu/drm/amd/display/dc/Makefile +1 -1
@@ -25,7 +25,7 @@ DC_LIBS = basics bios calcs dce gpio i2caux irq virtual -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 DC_LIBS += dcn10 dml endif
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +1 -1
@@ -55,7 +55,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(case DCE_VERSION_11_22 : *h =dal_cmd_tbl_helper_dce112_get_table2 ();return true; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 : *h =dal_cmd_tbl_helper_dce112_get_table2 ();return true;
drivers/gpu/drm/amd/display/dc/calcs/Makefile +1 -1
@@ -38,7 +38,7 @@ CFLAGS_dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare BW_CALCS = dce_calcs.o bw_fixed.o custom_float.o -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 BW_CALCS += dcn_calcs.o dcn_calc_math.o dcn_calc_auto.o endif
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -3
@@ -491,7 +491,7 @@ static void destruct(struct dc *dc)kfree (dc->bw_dceip); dc->bw_dceip =NULL ; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 kfree (dc->dcn_soc); dc->dcn_soc =NULL ;
@@ -507,7 +507,7 @@ static bool construct(struct dc *dc,struct dc_context *dc_ctx;struct bw_calcs_dceip *dc_dceip;struct bw_calcs_vbios *dc_vbios; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct dcn_soc_bounding_box *dcn_soc;struct dcn_ip_params *dcn_ip;#endif
@@ -529,7 +529,7 @@ static bool construct(struct dc *dc, } dc->bw_vbios = dc_vbios; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 dcn_soc =kzalloc (sizeof (*dcn_soc),GFP_KERNEL );if (!dcn_soc) {dm_error ("%s: failed to create dcn_soc\n" , __func__);
drivers/gpu/drm/amd/display/dc/core/dc_debug.c +1 -1
@@ -348,7 +348,7 @@ void context_clock_trace( struct dc *dc, struct dc_state *context) { -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )DC_LOGGER_INIT (dc->ctx->logger); CLOCK_TRACE("Current: dispclk_khz:%d max_dppclk_khz:%d dcfclk_khz:%d\n" "dcfclk_deep_sleep_khz:%d fclk_khz:%d socclk_khz:%d\n",
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +6 -6
@@ -41,7 +41,7 @@#include "dce100/dce100_resource.h" #include "dce110/dce110_resource.h" #include "dce112/dce112_resource.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn10/dcn10_resource.h" #endif #include "dce120/dce120_resource.h"
@@ -85,7 +85,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)case FAMILY_AI : dc_version =DCE_VERSION_12_0 ;break ; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case FAMILY_RV : dc_version =DCN_VERSION_1_0 ;break ;
@@ -136,7 +136,7 @@ struct resource_pool *dc_create_resource_pool( num_virtual_links, dc);break ; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 : res_pool =dcn10_create_resource_pool ( num_virtual_links, dc);
@@ -1303,7 +1303,7 @@ static struct pipe_ctx *acquire_free_pipe_for_stream( } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 ) static int acquire_first_split_pipe( struct resource_context *res_ctx, const struct resource_pool *pool,
@@ -1374,7 +1374,7 @@ bool dc_add_plane_to_context( free_pipe =acquire_free_pipe_for_stream (context, pool, stream); -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (!free_pipe) {int pipe_idx =acquire_first_split_pipe (&context->res_ctx, pool, stream);if (pipe_idx >=0 )
@@ -1992,7 +1992,7 @@ enum dc_status resource_map_pool_resources(/* acquire new resources */ pipe_idx =acquire_first_free_pipe (&context->res_ctx, pool, stream); -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 if (pipe_idx <0 ) pipe_idx =acquire_first_split_pipe (&context->res_ctx, pool, stream);#endif
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -294,7 +294,7 @@ struct dc {/* Inputs into BW and WM calculations. */ struct bw_calcs_dceip *bw_dceip;struct bw_calcs_vbios *bw_vbios; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct dcn_soc_bounding_box *dcn_soc;struct dcn_ip_params *dcn_ip;struct display_mode_lib dml;
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +3 -3
@@ -592,7 +592,7 @@ static uint32_t dce110_get_pix_clk_dividers(case DCE_VERSION_11_2 :case DCE_VERSION_11_22 :case DCE_VERSION_12_0 : -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 :#endif
@@ -909,7 +909,7 @@ static bool dce110_program_pix_clk(struct dce110_clk_src *clk_src =TO_DCE110_CLK_SRC (clock_source);struct bp_pixel_clock_parameters bp_pc_params = {0 }; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (IS_FPGA_MAXIMUS_DC (clock_source->ctx->dce_environment)) {unsigned int inst = pix_clk_params->controller_id -CONTROLLER_ID_D0 ;unsigned dp_dto_ref_kHz =700000 ;
@@ -982,7 +982,7 @@ static bool dce110_program_pix_clk(case DCE_VERSION_11_2 :case DCE_VERSION_11_22 :case DCE_VERSION_12_0 : -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 :#endif
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.h +1 -1
@@ -55,7 +55,7 @@CS_SF (PHYPLLA_PIXCLK_RESYNC_CNTL ,PHYPLLA_DCCG_DEEP_COLOR_CNTL , mask_sh),\ CS_SF(PHYPLLA_PIXCLK_RESYNC_CNTL, PHYPLLA_PIXCLK_DOUBLE_RATE_ENABLE, mask_sh) -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#define CS_COMMON_REG_LIST_DCN1_0 (index, pllid) \ SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c +4 -4
@@ -30,7 +30,7 @@#include "bios_parser_interface.h" #include "dc.h" #include "dmcu.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn_calcs.h" #endif #include "core_types.h"
@@ -480,7 +480,7 @@ static void dce12_update_clocks(struct dccg *dccg, } } -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 static int dcn1_determine_dppclk_threshold (struct dccg *dccg,struct dc_clocks *new_clocks) {bool request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz;
@@ -725,7 +725,7 @@ static bool dce_update_dfs_bypass(return false; } -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 static const struct display_clock_funcs dcn1_funcs = { .get_dp_ref_clk_frequency = dce12_get_dp_ref_freq_khz, .set_dispclk = dce112_set_clock,
@@ -882,7 +882,7 @@ struct dccg *dce120_dccg_create(struct dc_context *ctx)return &clk_dce->base; } -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct dccg *dcn1_dccg_create (struct dc_context *ctx) {struct dc_debug_options *debug = &ctx->dc->debug;
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h +1 -1
@@ -114,7 +114,7 @@ struct dccg *dce112_dccg_create(struct dccg *dce120_dccg_create (struct dc_context *ctx); -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct dccg *dcn1_dccg_create (struct dc_context *ctx);#endif
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +3 -3
@@ -316,7 +316,7 @@ static void dce_get_psr_wait_loop(return ; } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )static void dcn10_get_dmcu_state (struct dmcu *dmcu) {struct dce_dmcu *dmcu_dce =TO_DCE_DMCU (dmcu);
@@ -743,7 +743,7 @@ static const struct dmcu_funcs dce_funcs = { .is_dmcu_initialized = dce_is_dmcu_initialized }; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )static const struct dmcu_funcs dcn10_funcs = { .dmcu_init = dcn10_dmcu_init, .load_iram = dcn10_dmcu_load_iram,
@@ -795,7 +795,7 @@ struct dmcu *dce_dmcu_create(return &dmcu_dce->base; } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 ) struct dmcu *dcn10_dmcu_create( struct dc_context *ctx, const struct dce_dmcu_registers *regs,
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +10 -10
@@ -135,7 +135,7 @@ static void dce110_update_generic_info_packet(AFMT_GENERIC0_UPDATE , (packet_index ==0 ), AFMT_GENERIC2_UPDATE, (packet_index == 2)); } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (REG (AFMT_VBI_PACKET_CONTROL1 )) {switch (packet_index) {case 0 :
@@ -229,7 +229,7 @@ static void dce110_update_hdmi_info_packet(HDMI_GENERIC1_SEND , send, HDMI_GENERIC1_LINE, line);break ; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case 4 :if (REG (HDMI_GENERIC_PACKET_CONTROL2 )) REG_UPDATE_3(HDMI_GENERIC_PACKET_CONTROL2,
@@ -274,7 +274,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute( struct dc_crtc_timing *crtc_timing, enum dc_color_space output_color_space) { -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )uint32_t h_active_start;uint32_t v_active_start;uint32_t misc0 =0 ;
@@ -317,7 +317,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(if (enc110->se_mask->DP_VID_M_DOUBLE_VALUE_EN)REG_UPDATE (DP_VID_TIMING ,DP_VID_M_DOUBLE_VALUE_EN ,1 ); -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (enc110->se_mask->DP_VID_N_MUL)REG_UPDATE (DP_VID_TIMING ,DP_VID_N_MUL ,1 );#endif
@@ -328,7 +328,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(break ; } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (REG (DP_MSA_MISC )) misc1 =REG_READ (DP_MSA_MISC );#endif
@@ -362,7 +362,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(/* set dynamic range and YCbCr range */ -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )switch (crtc_timing->display_color_depth) {case COLOR_DEPTH_666 : colorimetry_bpc =0 ;
@@ -441,7 +441,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(DP_DYN_RANGE , dynamic_range_rgb, DP_YCBCR_RANGE, dynamic_range_ycbcr); -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (REG (DP_MSA_COLORIMETRY ))REG_SET (DP_MSA_COLORIMETRY ,0 ,DP_MSA_MISC0 , misc0);
@@ -476,7 +476,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute( crtc_timing->v_front_porch; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )/* start at begining of left border */ if (REG (DP_MSA_TIMING_PARAM2 )) REG_SET_2(DP_MSA_TIMING_PARAM2, 0,
@@ -751,7 +751,7 @@ static void dce110_stream_encoder_update_hdmi_info_packets(dce110_update_hdmi_info_packet (enc110,3 , &info_frame->hdrsmd); } -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )if (enc110->se_mask->HDMI_DB_DISABLE) {/* for bring up, disable dp double TODO */ if (REG (HDMI_DB_CONTROL ))
@@ -789,7 +789,7 @@ static void dce110_stream_encoder_stop_hdmi_info_packets(HDMI_GENERIC1_LINE ,0 , HDMI_GENERIC1_SEND, 0); -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )/* stop generic packets 2 & 3 on HDMI */ if (REG (HDMI_GENERIC_PACKET_CONTROL2 )) REG_SET_6(HDMI_GENERIC_PACKET_CONTROL2, 0,
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -1
@@ -1250,7 +1250,7 @@ static void program_scaler(const struct dc *dc, {struct tg_color color = {0 }; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )/* TOFPGA */ if (pipe_ctx->plane_res.xfm->funcs->transform_set_pixel_storage_depth ==NULL )return ;
drivers/gpu/drm/amd/display/dc/gpio/Makefile +1 -1
@@ -61,7 +61,7 @@ AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCE120) ############################################################################### # DCN 1x ############################################################################### -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 GPIO_DCN10 = hw_translate_dcn10.o hw_factory_dcn10.o AMD_DAL_GPIO_DCN10 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn10/,$(GPIO_DCN10))
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +2 -2
@@ -43,7 +43,7 @@#include "dce80/hw_factory_dce80.h" #include "dce110/hw_factory_dce110.h" #include "dce120/hw_factory_dce120.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn10/hw_factory_dcn10.h" #endif
@@ -81,7 +81,7 @@ bool dal_hw_factory_init(case DCE_VERSION_12_0 :dal_hw_factory_dce120_init (factory);return true; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 :dal_hw_factory_dcn10_init (factory);return true;
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +2 -2
@@ -43,7 +43,7 @@#include "dce80/hw_translate_dce80.h" #include "dce110/hw_translate_dce110.h" #include "dce120/hw_translate_dce120.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn10/hw_translate_dcn10.h" #endif
@@ -78,7 +78,7 @@ bool dal_hw_translate_init(case DCE_VERSION_12_0 :dal_hw_translate_dce120_init (translate);return true; -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 :dal_hw_translate_dcn10_init (translate);return true;
drivers/gpu/drm/amd/display/dc/i2caux/Makefile +1 -1
@@ -71,7 +71,7 @@ AMD_DISPLAY_FILES += $(AMD_DAL_I2CAUX_DCE112) ############################################################################### # DCN 1.0 family ############################################################################### -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 I2CAUX_DCN1 = i2caux_dcn10.o AMD_DAL_I2CAUX_DCN1 = $(addprefix $(AMDDALPATH)/dc/i2caux/dcn10/,$(I2CAUX_DCN1))
drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +2 -2
@@ -59,7 +59,7 @@#include "dce120/i2caux_dce120.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn10/i2caux_dcn10.h" #endif
@@ -91,7 +91,7 @@ struct i2caux *dal_i2caux_create(return dal_i2caux_dce100_create (ctx);case DCE_VERSION_12_0 :return dal_i2caux_dce120_create (ctx); -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case DCN_VERSION_1_0 :return dal_i2caux_dcn10_create (ctx);#endif
drivers/gpu/drm/amd/display/dc/inc/core_types.h +3 -3
@@ -33,7 +33,7 @@#include "dc_bios_types.h" #include "mem_input.h" #include "hubp.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "mpc.h" #endif
@@ -221,7 +221,7 @@ struct pipe_ctx {struct pipe_ctx *top_pipe;struct pipe_ctx *bottom_pipe; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct _vcs_dpi_display_dlg_regs_st dlg_regs;struct _vcs_dpi_display_ttu_regs_st ttu_regs;struct _vcs_dpi_display_rq_regs_st rq_regs;
@@ -276,7 +276,7 @@ struct dc_state {/* Note: these are big structures, do *not* put on stack! */ struct dm_pp_display_configuration pp_display_cfg; -#ifdef CONFIG_X86 +#ifdef CONFIG_DRM_AMD_DC_DCN1_0 struct dcn_bw_internal_vars dcn_bw_vars;#endif
drivers/gpu/drm/amd/display/dc/irq/Makefile +1 -1
@@ -60,7 +60,7 @@ AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCE12) ############################################################################### # DCN 1x ############################################################################### -ifdef CONFIG_X86 +ifdef CONFIG_DRM_AMD_DC_DCN1_0 IRQ_DCN1 = irq_service_dcn10.o AMD_DAL_IRQ_DCN1 = $(addprefix $(AMDDALPATH)/dc/irq/dcn10/,$(IRQ_DCN1))
drivers/gpu/drm/amd/display/dc/irq/irq_service.c +1 -1
@@ -36,7 +36,7 @@#include "dce120/irq_service_dce120.h" -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include "dcn10/irq_service_dcn10.h" #endif
drivers/gpu/drm/amd/display/dc/os_types.h +1 -1
@@ -48,7 +48,7 @@#define dm_error (fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) -#ifdef CONFIG_X86 +#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )#include <asm/fpu/api.h> #endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[email protected]
maintainerPATCH 2/2 drm/amd/display: Don't build DCN1 when kcov is enabled
From: "Leo (Sunpeng) Li" <[email protected]>
DCN1 contains code that utilizes fp math. When CONFIG_KCOV_INSTRUMENT_ALL and CONFIG_KCOV_ENABLE_COMPARISONS are enabled, build errors are found. See this earlier patch for details:
https://lists.freedesktop.org/archives/dri-devel/2018-August/186131.html
As a short term solution, disable CONFIG_DRM_AMD_DC_DCN1_0 when KCOV_INSTRUMENT_ALL and KCOV_ENABLE_COMPARISONS are enabled. In addition, make it a fully derived config, taking into account CONFIG_X86.
--- drivers/gpu/drm/amd/display/Kconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +3 -5
@@ -4,18 +4,16 @@ menu "Display Engine Configuration" config DRM_AMD_DC bool "AMD DC - Enable new display engine" default y + select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and Raven ASICs. config DRM_AMD_DC_DCN1_0 - bool "DCN 1.0 Raven family" - depends on DRM_AMD_DC && X86 - default y + def_bool n help - Choose this option if you want to have - RV family for display engine + RV family support for display engine config DEBUG_KERNEL_DC bool "Enable kgdb break in DC"
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/display: Don't build DCN1 when kcov is enabled
Quoted 7 lines · On Thu, Aug 16, 2018 at 9:45 PM <[email protected]> wrote:
From: "Leo (Sunpeng) Li" <[email protected]>
DCN1 contains code that utilizes fp math. When
CONFIG_KCOV_INSTRUMENT_ALLandCONFIG_KCOV_ENABLE_COMPARISONSare enabled, build errors are found. See this earlier patch for details:
Quoted 8 lines
https://lists.freedesktop.org/archives/dri-devel/2018-August/186131.html
As a short term solution, disable
CONFIG_DRM_AMD_DC_DCN1_0whenKCOV_INSTRUMENT_ALLandKCOV_ENABLE_COMPARISONSare enabled. In addition, make it a fully derived config, taking into accountCONFIG_X86.Signed-off-by Leo (Sunpeng) Li <[email protected]>
Looks good to me,
Re: [PATCH 2/2] drm/amd/display: Don't build DCN1 when kcov is enabled
In reply to [email protected]Quoted 35 lines · On 2018-08-16 09:44 PM, [email protected] wrote:
From: "Leo (Sunpeng) Li" <[email protected]>
DCN1 contains code that utilizes fp math. When
CONFIG_KCOV_INSTRUMENT_ALLandCONFIG_KCOV_ENABLE_COMPARISONSare enabled, build errors are found. See this earlier patch for details:https://lists.freedesktop.org/archives/dri-devel/2018-August/186131.html
As a short term solution, disable
CONFIG_DRM_AMD_DC_DCN1_0whenKCOV_INSTRUMENT_ALLandKCOV_ENABLE_COMPARISONSare enabled. In addition, make it a fully derived config, taking into accountCONFIG_X86.Signed-off-by Leo (Sunpeng) Li <[email protected]>--- drivers/gpu/drm/amd/display/Kconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/display/Kconfig +1
-1@@ -4,18 +4,16 @@ menu "Display Engine Configuration" config DRM_AMD_DC bool "AMD DC - Enable new display engine" default y + select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and Raven ASICs. config DRM_AMD_DC_DCN1_0 - bool "DCN 1.0 Raven family"
drivers/gpu/drm/amd/display/Kconfig menu "Display Engine Configuration" · line 19
Quoted 10 lines
drivers/gpu/drm/amd/display/Kconfig +2
-4- depends on DRM_AMD_DC && X86 - default y + def_bool n help - Choose this option if you want to have - RV family for display engine + RV family support for display engine config DEBUG_KERNEL_DC bool "Enable kgdb break in DC"
Thanks Leo, Alex, Arnd et al for taking care of this! Apologies for the trouble caused by my change, and for not helping much with the solution (I was on vacation).
This series is
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 6 lines · On Thu, Aug 16, 2018 at 3:45 PM <[email protected]> wrote:
From: "Leo (Sunpeng) Li" <[email protected]>
This reverts commit
8624c3c4dbfe24fc6740687236a2e196f5f4bfb0.We need
CONFIG_DRM_AMD_DC_DCN1_0to guard code that is using fp math.
MIssing your SOB. WIth that fixed, series is:
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 16.08.2018 um 21:44 schrieb [email protected]:
drivers/gpu/drm/amd/display/Kconfig config DRM_AMD_DC · line 19
Quoted 9 lines
[SNIP]
drivers/gpu/drm/amd/display/Kconfig +8
-0+config DRM_AMD_DC_DCN1_0 + bool "DCN 1.0 Raven family" + depends on DRM_AMD_DC && X86 + default y + help + Choose this option if you want to have + RV family for display engine +
Probably better to follow Michel's suggestion and not make that an use configurable option.
Instead just select it based on the dependencies.
Christian.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Leo Li
maintainerQuoted 13 lines · Christian König
Am 16.08.2018 um 21:44 schrieb [email protected]:
drivers/gpu/drm/amd/display/Kconfig config DRM_AMD_DC · line 19
Quoted 9 lines
[SNIP]
drivers/gpu/drm/amd/display/Kconfig +8
-0+config DRM_AMD_DC_DCN1_0 + bool "DCN 1.0 Raven family" + depends on DRM_AMD_DC && X86 + default y + help + Choose this option if you want to have + RV family for display engine +Probably better to follow Michel's suggestion and not make that an use configurable option.
Quoted 1 line
Instead just select it based on the dependencies.
The 2nd patch should have taken care of that :)
Leo
Quoted 6 lines
Christian.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx