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
|
From 3bd6a2f365fb669a0077ec321389c197fee37758 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Tue, 1 Dec 2015 16:47:39 -0500
Subject: [PATCH 0558/1110] drm/amd/dal: Call stream as it is in payload table
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c | 2 +-
drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c | 9 ++++++---
drivers/gpu/drm/amd/dal/include/link_service_types.h | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
index 053add1..2554e1a 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
@@ -304,7 +304,7 @@ bool dc_helpers_dp_mst_write_payload_allocation_table(
* find sink --> stream --> target -->
* connector
*/
- table->stream_allocations[i].engine =
+ table->stream_allocations[i].stream =
dc_target->streams[j];
/* exit loop connector */
find_stream_for_sink = true;
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 63e8c47..cd1924a 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
@@ -1608,7 +1608,8 @@ void dce110_link_encoder_update_mst_stream_allocation_table(
value1 = dal_read_reg(ctx, DP_REG(mmDP_MSE_SAT1));
if (table->stream_count >= 1) {
- core_stream = DC_STREAM_TO_CORE(table->stream_allocations[0].engine);
+ core_stream =
+ DC_STREAM_TO_CORE(table->stream_allocations[0].stream);
set_reg_field_value(
value0,
@@ -1624,7 +1625,8 @@ void dce110_link_encoder_update_mst_stream_allocation_table(
}
if (table->stream_count >= 2) {
- core_stream = DC_STREAM_TO_CORE(table->stream_allocations[1].engine);
+ core_stream =
+ DC_STREAM_TO_CORE(table->stream_allocations[1].stream);
set_reg_field_value(
value0,
@@ -1640,7 +1642,8 @@ void dce110_link_encoder_update_mst_stream_allocation_table(
}
if (table->stream_count >= 3) {
- core_stream = DC_STREAM_TO_CORE(table->stream_allocations[2].engine);
+ core_stream =
+ DC_STREAM_TO_CORE(table->stream_allocations[2].stream);
set_reg_field_value(
value1,
diff --git a/drivers/gpu/drm/amd/dal/include/link_service_types.h b/drivers/gpu/drm/amd/dal/include/link_service_types.h
index 796c1ea..d91f4b0 100644
--- a/drivers/gpu/drm/amd/dal/include/link_service_types.h
+++ b/drivers/gpu/drm/amd/dal/include/link_service_types.h
@@ -392,7 +392,7 @@ struct mst_device_info {
/* DP MST stream allocation (payload bandwidth number) */
struct dp_mst_stream_allocation {
/* stream engine id (DIG) */
- const struct dc_stream *engine;
+ const struct dc_stream *stream;
/* number of slots required for the DP stream in
* transport packet */
uint32_t slot_count;
--
2.7.4
|
