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
108
109
110
111
112
|
From 1ad8ba32ffed2cae879b62c2cb42382bb33a980f Mon Sep 17 00:00:00 2001
From: Hersen Wu <hersenxs.wu@amd.com>
Date: Tue, 26 Jan 2016 09:59:27 -0500
Subject: [PATCH 0732/1110] drm/amd/dal: dce resoure missing register instancee
more than 4 for dce110 and dce100
Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
.../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 17 ++++++++++---
.../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 29 +++++++++++++++-------
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
index 2bf66c6..7ce1bb4 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c
@@ -208,7 +208,10 @@ static const struct dce110_link_enc_bl_registers link_enc_bl_regs = {
static const struct dce110_link_enc_aux_registers link_enc_aux_regs[] = {
aux_regs(0),
aux_regs(1),
- aux_regs(2)
+ aux_regs(2),
+ aux_regs(3),
+ aux_regs(4),
+ aux_regs(5)
};
#define link_regs(id)\
@@ -236,7 +239,11 @@ static const struct dce110_link_enc_aux_registers link_enc_aux_regs[] = {
static const struct dce110_link_enc_registers link_enc_regs[] = {
link_regs(0),
link_regs(1),
- link_regs(2)
+ link_regs(2),
+ link_regs(3),
+ link_regs(4),
+ link_regs(5),
+ link_regs(6)
};
#define stream_enc_regs(id)\
@@ -273,7 +280,11 @@ static const struct dce110_link_enc_registers link_enc_regs[] = {
static const struct dce110_stream_enc_registers stream_enc_regs[] = {
stream_enc_regs(0),
stream_enc_regs(1),
- stream_enc_regs(2)
+ stream_enc_regs(2),
+ stream_enc_regs(3),
+ stream_enc_regs(4),
+ stream_enc_regs(5),
+ stream_enc_regs(6)
};
#define DCFE_MEM_PWR_CTRL_REG_BASE 0x1b03
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 44558d5..bd9f311 100644
--- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c
@@ -170,9 +170,12 @@ static const struct dce110_link_enc_bl_registers link_enc_bl_regs = {
}
static const struct dce110_link_enc_aux_registers link_enc_aux_regs[] = {
- aux_regs(0),
- aux_regs(1),
- aux_regs(2)
+ aux_regs(0),
+ aux_regs(1),
+ aux_regs(2),
+ aux_regs(3),
+ aux_regs(4),
+ aux_regs(5)
};
#define link_regs(id)\
@@ -198,9 +201,13 @@ static const struct dce110_link_enc_aux_registers link_enc_aux_regs[] = {
}
static const struct dce110_link_enc_registers link_enc_regs[] = {
- link_regs(0),
- link_regs(1),
- link_regs(2)
+ link_regs(0),
+ link_regs(1),
+ link_regs(2),
+ link_regs(3),
+ link_regs(4),
+ link_regs(5),
+ link_regs(6)
};
#define stream_enc_regs(id)\
@@ -235,9 +242,13 @@ static const struct dce110_link_enc_registers link_enc_regs[] = {
}
static const struct dce110_stream_enc_registers stream_enc_regs[] = {
- stream_enc_regs(0),
- stream_enc_regs(1),
- stream_enc_regs(2)
+ stream_enc_regs(0),
+ stream_enc_regs(1),
+ stream_enc_regs(2),
+ stream_enc_regs(3),
+ stream_enc_regs(4),
+ stream_enc_regs(5),
+ stream_enc_regs(6)
};
--
2.7.4
|
