leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: separate dc_debug into dc_debug_options and dc_debug data

Browse Source 
[why]
confusing as to which part of debug is informational, and which part causes behavioral change

Signed-off-by: Jun Lei <Jun.Lei@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Jun Lei 2018-07-12 10:35:01 -04:00 committed by Alex Deucher
parent 5c6ac7112f
commit cfd84fd365
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
View File

@ -676,7 +676,7 @@ static void hack_force_pipe_split(struct dcn_bw_internal_vars *v,
} }
static void hack_bounding_box(struct dcn_bw_internal_vars *v, static void hack_bounding_box(struct dcn_bw_internal_vars *v,
struct dc_debug *dbg, struct dc_debug_options *dbg,
struct dc_state *context) struct dc_state *context)
{ {
if (dbg->pipe_split_policy == MPC_SPLIT_AVOID) if (dbg->pipe_split_policy == MPC_SPLIT_AVOID)

2
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
View File

@ -1029,7 +1029,7 @@ enum link_training_result dc_link_dp_perform_link_training(
lt_settings.lane_settings[0].PRE_EMPHASIS); lt_settings.lane_settings[0].PRE_EMPHASIS);
if (status != LINK_TRAINING_SUCCESS) if (status != LINK_TRAINING_SUCCESS)
link->ctx->dc->debug.debug_data.ltFailCount++; link->ctx->dc->debug_data.ltFailCount++;
return status; return status;
} }

21
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -207,7 +207,7 @@ struct dc_clocks {
int phyclk_khz; int phyclk_khz;
}; };
struct dc_debug { struct dc_debug_options {
enum visual_confirm visual_confirm; enum visual_confirm visual_confirm;
bool sanity_checks; bool sanity_checks;
bool max_disp_clk; bool max_disp_clk;
@ -259,13 +259,15 @@ struct dc_debug {
bool scl_reset_length10; bool scl_reset_length10;
bool hdmi20_disable; bool hdmi20_disable;
bool skip_detection_link_training; bool skip_detection_link_training;
struct {
uint32_t ltFailCount;
uint32_t i2cErrorCount;
uint32_t auxErrorCount;
} debug_data;
}; };
struct dc_debug_data {
uint32_t ltFailCount;
uint32_t i2cErrorCount;
uint32_t auxErrorCount;
};
struct dc_state; struct dc_state;
struct resource_pool; struct resource_pool;
struct dce_hwseq; struct dce_hwseq;
@ -274,8 +276,7 @@ struct dc {
struct dc_caps caps; struct dc_caps caps;
struct dc_cap_funcs cap_funcs; struct dc_cap_funcs cap_funcs;
struct dc_config config; struct dc_config config;
struct dc_debug debug; struct dc_debug_options debug;
struct dc_context *ctx; struct dc_context *ctx;
uint8_t link_count; uint8_t link_count;
@ -311,6 +312,8 @@ struct dc {
/* FBC compressor */ /* FBC compressor */
struct compressor *fbc_compressor; struct compressor *fbc_compressor;
struct dc_debug_data debug_data;
}; };
enum frame_buffer_mode { enum frame_buffer_mode {

4
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
View File

@ -337,7 +337,7 @@ static int dce112_set_clock(
static void dce_clock_read_integrated_info(struct dce_dccg *clk_dce) static void dce_clock_read_integrated_info(struct dce_dccg *clk_dce)
{ {
struct dc_debug *debug = &clk_dce->base.ctx->dc->debug; struct dc_debug_options *debug = &clk_dce->base.ctx->dc->debug;
struct dc_bios *bp = clk_dce->base.ctx->dc_bios; struct dc_bios *bp = clk_dce->base.ctx->dc_bios;
struct integrated_info info = { { { 0 } } }; struct integrated_info info = { { { 0 } } };
struct dc_firmware_info fw_info = { { 0 } }; struct dc_firmware_info fw_info = { { 0 } };
@ -824,7 +824,7 @@ struct dccg *dce120_dccg_create(struct dc_context *ctx)
#ifdef CONFIG_X86 #ifdef CONFIG_X86
struct dccg *dcn1_dccg_create(struct dc_context *ctx) struct dccg *dcn1_dccg_create(struct dc_context *ctx)
{ {
struct dc_debug *debug = &ctx->dc->debug; struct dc_debug_options *debug = &ctx->dc->debug;
struct dc_bios *bp = ctx->dc_bios; struct dc_bios *bp = ctx->dc_bios;
struct dc_firmware_info fw_info = { { 0 } }; struct dc_firmware_info fw_info = { { 0 } };
struct dce_dccg *clk_dce = kzalloc(sizeof(*clk_dce), GFP_KERNEL); struct dce_dccg *clk_dce = kzalloc(sizeof(*clk_dce), GFP_KERNEL);

2
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
View File

@ -404,7 +404,7 @@ static const struct resource_caps res_cap = {
.num_pll = 6, .num_pll = 6,
}; };
static const struct dc_debug debug_defaults = { static const struct dc_debug_options debug_defaults = {
.disable_clock_gate = true, .disable_clock_gate = true,
}; };

4
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
View File

@ -502,7 +502,7 @@ static const struct resource_caps res_cap = {
.num_pll = 4, .num_pll = 4,
}; };
static const struct dc_debug debug_defaults_drv = { static const struct dc_debug_options debug_defaults_drv = {
.sanity_checks = true, .sanity_checks = true,
.disable_dmcu = true, .disable_dmcu = true,
.force_abm_enable = false, .force_abm_enable = false,
@ -530,7 +530,7 @@ static const struct dc_debug debug_defaults_drv = {
.max_downscale_src_width = 3840, .max_downscale_src_width = 3840,
}; };
static const struct dc_debug debug_defaults_diags = { static const struct dc_debug_options debug_defaults_diags = {
.disable_dmcu = true, .disable_dmcu = true,
.force_abm_enable = false, .force_abm_enable = false,
.timing_trace = true, .timing_trace = true,