diff options
| author | Zeyu Fan <Zeyu.Fan@amd.com> | 2017-07-23 18:30:15 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:15:34 -0400 |
| commit | 08b1688620426ad3e09fc7a98aabc28dda30cde6 (patch) | |
| tree | 921ed437878fc27907316489736a05a76a1ad917 /drivers/gpu/drm/amd/display/dc/inc | |
| parent | c8d7bd8bd0c08aa9115589d264e274ed7fdf4c2e (diff) | |
drm/amd/display: Move DCHUBBUB block from MemInput to HW sequencer.
Signed-off-by: Zeyu Fan <Zeyu.Fan@amd.com>
Reviewed-by: Zeyu Fan <Zeyu.Fan@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/amd/display/dc/inc')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h index 1b7d151a66f8..fd3ce742af2c 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h @@ -75,11 +75,6 @@ struct mem_input { struct mem_input_funcs { #if defined(CONFIG_DRM_AMD_DC_DCN1_0) - void (*program_watermarks)( - struct mem_input *mem_input, - struct dcn_watermark_set *watermarks, - unsigned int refclk_period_ns); - void (*mem_input_setup)( struct mem_input *mem_input, struct _vcs_dpi_display_dlg_regs_st *dlg_regs, @@ -143,7 +138,7 @@ struct mem_input_funcs { bool (*mem_input_is_flip_pending)(struct mem_input *mem_input); void (*mem_input_update_dchub)(struct mem_input *mem_input, - struct dchub_init_data *dh_data); + struct dchub_init_data *dh_data); void (*set_blank)(struct mem_input *mi, bool blank); }; 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 22aca5a375ae..d865df802c88 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h @@ -79,6 +79,10 @@ struct hw_sequencer_funcs { const struct core_dc *dc, struct pipe_ctx *pipe_ctx); + void (*update_dchub)( + struct dce_hwseq *hws, + struct dchub_init_data *dh_data); + void (*update_pending_status)( struct pipe_ctx *pipe_ctx); |