From 055597f0f621a9a8fbd6775150531a1337a0ff4d Mon Sep 17 00:00:00 2001 From: Chris Park Date: Tue, 1 Dec 2015 13:00:00 -0500 Subject: [PATCH 0552/1110] drm/amd/dal: Fix minor fomatting issue and dependencies Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c | 5 +++-- drivers/gpu/drm/amd/dal/dc/dce_base/dce_base_resource.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/inc/link_encoder.h | 2 ++ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c index 4381a94..c047bcb 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c @@ -1093,7 +1093,7 @@ static bool validate_wireless_output( return false; } -bool dce110_link_encoder_construct( +static bool construct( struct dce110_link_encoder *enc110, const struct encoder_init_data *init_data) { @@ -1225,7 +1225,7 @@ struct link_encoder *dce110_link_encoder_create( if (!enc110) return NULL; - if (dce110_link_encoder_construct(enc110, init)) + if (construct(enc110, init)) return &enc110->base; BREAK_TO_DEBUGGER(); diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c index 77fbbe4..6ad681b 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c @@ -24,8 +24,8 @@ */ #include "dc_services.h" -#include "link_encoder_types.h" -#include "stream_encoder_types.h" +#include "link_encoder.h" +#include "stream_encoder.h" #include "resource.h" #include "dce_base/dce_base_resource.h" diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c index 8f5560a..4bf3128 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_stream_encoder.c @@ -806,7 +806,7 @@ static void setup_hdmi( } -bool dce110_stream_encoder_construct( +static bool construct( struct dce110_stream_encoder *enc110, struct dc_context *ctx, struct bios_parser *bp, @@ -833,7 +833,8 @@ struct stream_encoder *dce110_stream_encoder_create( if (!enc110) return NULL; - if (dce110_stream_encoder_construct(enc110, ctx, bp, eng_id)) + + if (construct(enc110, ctx, bp, eng_id)) return &enc110->base; BREAK_TO_DEBUGGER(); diff --git a/drivers/gpu/drm/amd/dal/dc/dce_base/dce_base_resource.c b/drivers/gpu/drm/amd/dal/dc/dce_base/dce_base_resource.c index 06047ab..ba74ff5 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce_base/dce_base_resource.c +++ b/drivers/gpu/drm/amd/dal/dc/dce_base/dce_base_resource.c @@ -28,8 +28,8 @@ #include "adjustment_types.h" #include "set_mode_types.h" -#include "stream_encoder_types.h" -#include "link_encoder_types.h" +#include "stream_encoder.h" +#include "link_encoder.h" #include "resource.h" diff --git a/drivers/gpu/drm/amd/dal/dc/inc/link_encoder.h b/drivers/gpu/drm/amd/dal/dc/inc/link_encoder.h index 8b19b00..d4a0d24 100644 --- a/drivers/gpu/drm/amd/dal/dc/inc/link_encoder.h +++ b/drivers/gpu/drm/amd/dal/dc/inc/link_encoder.h @@ -8,6 +8,8 @@ #ifndef LINK_ENCODER_H_ #define LINK_ENCODER_H_ +#include "include/encoder_types.h" + struct link_enc_status { int dummy; /*TODO*/ }; -- 2.7.4