diff options
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c index 6668cb81e858..a28c4ae0f259 100644 --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c @@ -46,7 +46,7 @@ #include "dce/dce_audio.h" #include "dce/dce_hwseq.h" #include "dce100/dce100_hw_sequencer.h" -#include "dce/dce_panel.h" +#include "dce/dce_panel_cntl.h" #include "reg_helper.h" @@ -250,16 +250,16 @@ static const struct dce_stream_encoder_mask se_mask = { SE_COMMON_MASK_SH_LIST_DCE80_100(_MASK) }; -static const struct dce_panel_registers panel_regs[] = { - { DCE_PANEL_REG_LIST() } +static const struct dce_panel_cntl_registers panel_cntl_regs[] = { + { DCE_PANEL_CNTL_REG_LIST() } }; -static const struct dce_panel_shift panel_shift = { - DCE_PANEL_MASK_SH_LIST(__SHIFT) +static const struct dce_panel_cntl_shift panel_cntl_shift = { + DCE_PANEL_CNTL_MASK_SH_LIST(__SHIFT) }; -static const struct dce_panel_mask panel_mask = { - DCE_PANEL_MASK_SH_LIST(_MASK) +static const struct dce_panel_cntl_mask panel_cntl_mask = { + DCE_PANEL_CNTL_MASK_SH_LIST(_MASK) }; #define opp_regs(id)\ @@ -640,21 +640,21 @@ struct link_encoder *dce100_link_encoder_create( return &enc110->base; } -static struct panel *dce100_panel_create(const struct panel_init_data *init_data) +static struct panel_cntl *dce100_panel_cntl_create(const struct panel_cntl_init_data *init_data) { - struct dce_panel *panel = - kzalloc(sizeof(struct dce_panel), GFP_KERNEL); + struct dce_panel_cntl *panel_cntl = + kzalloc(sizeof(struct dce_panel_cntl), GFP_KERNEL); - if (!panel) + if (!panel_cntl) return NULL; - dce_panel_construct(panel, + dce_panel_cntl_construct(panel_cntl, init_data, - &panel_regs[init_data->inst], - &panel_shift, - &panel_mask); + &panel_cntl_regs[init_data->inst], + &panel_cntl_shift, + &panel_cntl_mask); - return &panel->base; + return &panel_cntl->base; } struct output_pixel_processor *dce100_opp_create( @@ -973,7 +973,7 @@ struct stream_encoder *dce100_find_first_free_match_stream_enc_for_link( static const struct resource_funcs dce100_res_pool_funcs = { .destroy = dce100_destroy_resource_pool, .link_enc_create = dce100_link_encoder_create, - .panel_create = dce100_panel_create, + .panel_cntl_create = dce100_panel_cntl_create, .validate_bandwidth = dce100_validate_bandwidth, .validate_plane = dce100_validate_plane, .add_stream_to_ctx = dce100_add_stream_to_ctx, |