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
113
114
115
116
117
118
119
120
121
|
From be244c61c31174bb626fbdd97ae3d23bf33e9358 Mon Sep 17 00:00:00 2001
From: Vitaly Prosyak <vitaly.prosyak@amd.com>
Date: Mon, 12 Jun 2017 11:03:26 -0500
Subject: [PATCH 0523/4131] drm/amd/display: RV stereo support
Re-organize 3d declarations
Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/dc.h | 8 +-----
drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 43 +++++++++++++++-------------
drivers/gpu/drm/amd/display/dc/dc_types.h | 9 ++++++
3 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index fb86808..a78af1e 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -787,13 +787,7 @@ struct dc_container_id {
unsigned short productCode;
};
-struct stereo_3d_features {
- bool supported ;
- bool allTimings ;
- bool cloneMode ;
- bool scaling ;
- bool singleFrameSWPacked;
-};
+
/*
* The sink structure contains EDID and other display device properties
diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index b6e6777..94fb930 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -551,27 +551,7 @@ enum dc_timing_standard {
TIMING_STANDARD_MAX
};
-enum dc_timing_3d_format {
- TIMING_3D_FORMAT_NONE,
- TIMING_3D_FORMAT_FRAME_ALTERNATE, /* No stereosync at all*/
- TIMING_3D_FORMAT_INBAND_FA, /* Inband Frame Alternate (DVI/DP)*/
- TIMING_3D_FORMAT_DP_HDMI_INBAND_FA, /* Inband FA to HDMI Frame Pack*/
- /* for active DP-HDMI dongle*/
- TIMING_3D_FORMAT_SIDEBAND_FA, /* Sideband Frame Alternate (eDP)*/
- TIMING_3D_FORMAT_HW_FRAME_PACKING,
- TIMING_3D_FORMAT_SW_FRAME_PACKING,
- TIMING_3D_FORMAT_ROW_INTERLEAVE,
- TIMING_3D_FORMAT_COLUMN_INTERLEAVE,
- TIMING_3D_FORMAT_PIXEL_INTERLEAVE,
- TIMING_3D_FORMAT_SIDE_BY_SIDE,
- TIMING_3D_FORMAT_TOP_AND_BOTTOM,
- TIMING_3D_FORMAT_SBS_SW_PACKED,
- /* Side-by-side, packed by application/driver into 2D frame*/
- TIMING_3D_FORMAT_TB_SW_PACKED,
- /* Top-and-bottom, packed by application/driver into 2D frame*/
- TIMING_3D_FORMAT_MAX,
-};
enum dc_color_depth {
COLOR_DEPTH_UNDEFINED,
@@ -643,6 +623,29 @@ struct dc_crtc_timing_flags {
};
+enum dc_timing_3d_format {
+ TIMING_3D_FORMAT_NONE,
+ TIMING_3D_FORMAT_FRAME_ALTERNATE, /* No stereosync at all*/
+ TIMING_3D_FORMAT_INBAND_FA, /* Inband Frame Alternate (DVI/DP)*/
+ TIMING_3D_FORMAT_DP_HDMI_INBAND_FA, /* Inband FA to HDMI Frame Pack*/
+ /* for active DP-HDMI dongle*/
+ TIMING_3D_FORMAT_SIDEBAND_FA, /* Sideband Frame Alternate (eDP)*/
+ TIMING_3D_FORMAT_HW_FRAME_PACKING,
+ TIMING_3D_FORMAT_SW_FRAME_PACKING,
+ TIMING_3D_FORMAT_ROW_INTERLEAVE,
+ TIMING_3D_FORMAT_COLUMN_INTERLEAVE,
+ TIMING_3D_FORMAT_PIXEL_INTERLEAVE,
+ TIMING_3D_FORMAT_SIDE_BY_SIDE,
+ TIMING_3D_FORMAT_TOP_AND_BOTTOM,
+ TIMING_3D_FORMAT_SBS_SW_PACKED,
+ /* Side-by-side, packed by application/driver into 2D frame*/
+ TIMING_3D_FORMAT_TB_SW_PACKED,
+ /* Top-and-bottom, packed by application/driver into 2D frame*/
+
+ TIMING_3D_FORMAT_MAX,
+};
+
+
struct dc_crtc_timing {
uint32_t h_total;
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 5269796..9662f2c 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -272,6 +272,15 @@ enum dc_timing_source {
TIMING_SOURCE_COUNT
};
+
+struct stereo_3d_features {
+ bool supported ;
+ bool allTimings ;
+ bool cloneMode ;
+ bool scaling ;
+ bool singleFrameSWPacked;
+};
+
enum dc_timing_support_method {
TIMING_SUPPORT_METHOD_UNDEFINED,
TIMING_SUPPORT_METHOD_EXPLICIT,
--
2.7.4
|
