1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
From 055597f0f621a9a8fbd6775150531a1337a0ff4d Mon Sep 17 00:00:00 2001
From: Chris Park <Chris.Park@amd.com>
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 <harry.wentland@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
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
|
