diff options
author | Tony Cheng <tony.cheng@amd.com> | 2017-07-20 00:12:20 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:15:23 -0400 |
commit | 6d244be884d20b1e9c912291a242dccedd6d9040 (patch) | |
tree | 2ad85bb4fbb956dcaa23a2cf67f129d785768188 /drivers/gpu/drm | |
parent | fc0956909f24d2cd6f69777881bcccd771a06f35 (diff) | |
download | linux-6d244be884d20b1e9c912291a242dccedd6d9040.tar.bz2 |
drm/amd/display: plumbing to allow easy print of HW state for DTN
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc.c | 7 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/include/logger_interface.h | 4 |
5 files changed, 27 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index eda36c7a5c57..ad1b90563eb6 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -2035,3 +2035,10 @@ bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data) } +void dc_log_hw_state(struct dc *dc) +{ + struct core_dc *core_dc = DC_TO_CORE(dc); + + if (core_dc->hwss.log_hw_state) + core_dc->hwss.log_hw_state(core_dc); +} diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index 7ecbff792e66..7b8e11c28c62 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -236,6 +236,8 @@ void dc_destroy(struct dc **dc); bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data); +void dc_log_hw_state(struct dc *dc); + /******************************************************************************* * Surface Interfaces ******************************************************************************/ diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 6543027469af..c0aa32b71ad1 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -1851,6 +1851,17 @@ static void dcn10_setup_stereo(struct pipe_ctx *pipe_ctx, struct core_dc *dc) return; } +static void dcn10_log_hw_state(struct core_dc *dc) +{ + struct dc_context *dc_ctx = dc->ctx; + + DTN_INFO("%s: Hello World", __func__); + + /* todo: add meaningful register reads and print out HW state + * + */ +} + static bool dcn10_dummy_display_power_gating( struct core_dc *dc, uint8_t controller_id, @@ -1887,6 +1898,7 @@ static const struct hw_sequencer_funcs dcn10_funcs = { .set_static_screen_control = set_static_screen_control, .setup_stereo = dcn10_setup_stereo, .set_avmute = dce110_set_avmute, + .log_hw_state = dcn10_log_hw_state, }; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h index d94e8e446ce5..4c027a98cfd3 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h @@ -154,6 +154,8 @@ struct hw_sequencer_funcs { struct core_dc *dc); void (*set_avmute)(struct pipe_ctx *pipe_ctx, bool enable); + + void (*log_hw_state)(struct core_dc *dc); }; void color_space_to_black_color( diff --git a/drivers/gpu/drm/amd/display/include/logger_interface.h b/drivers/gpu/drm/amd/display/include/logger_interface.h index ce5fef243b09..c861e726cd8f 100644 --- a/drivers/gpu/drm/amd/display/include/logger_interface.h +++ b/drivers/gpu/drm/amd/display/include/logger_interface.h @@ -123,6 +123,10 @@ void context_clock_trace( dm_logger_write(dc_ctx->logger, LOG_ERROR, \ __VA_ARGS__); +#define DTN_INFO(...) \ + dm_logger_write(dc_ctx->logger, LOG_DTN, \ + __VA_ARGS__) + #define DC_SYNC_INFO(...) \ dm_logger_write(dc_ctx->logger, LOG_SYNC, \ __VA_ARGS__); |