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
|
From f518ce43fc78e53322954c076484e2f543527048 Mon Sep 17 00:00:00 2001
From: Tyler DiBattista <tyler.dibattista@amd.com>
Date: Mon, 8 Apr 2019 13:30:07 -0400
Subject: [PATCH 2538/2940] drm/amd/display: move DWB structs and enums to
dc_hw_types
[Why]
these enums/structs will be used more generically in the future
so moving it to dc_hw_types and dc_types
Signed-off-by: Tyler DiBattista <tyler.dibattista@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 10 ++++++++++
drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +++++++
drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 17 -----------------
3 files changed, 17 insertions(+), 17 deletions(-)
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 ea7a1c9efca8..6b1431d63dab 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -840,6 +840,16 @@ enum dwb_subsample_position {
DWB_COSITED_SUBSAMPLING = 1
};
+enum dwb_stereo_eye_select {
+ DWB_STEREO_EYE_LEFT = 1, /* Capture left eye only */
+ DWB_STEREO_EYE_RIGHT = 2, /* Capture right eye only */
+};
+
+enum dwb_stereo_type {
+ DWB_STEREO_TYPE_FRAME_PACKING = 0, /* Frame packing */
+ DWB_STEREO_TYPE_FRAME_SEQUENTIAL = 3, /* Frame sequential */
+};
+
#define MCIF_BUF_COUNT 4
struct mcif_buf_params {
diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 5cd4ce07a265..2ebaf5ca5687 100644
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -432,6 +432,13 @@ enum display_content_type {
#if defined(CONFIG_DRM_AMD_DC_DCN2_0)
/* writeback */
+struct dwb_stereo_params {
+ bool stereo_enabled; /* false: normal mode, true: 3D stereo */
+ enum dwb_stereo_type stereo_type; /* indicates stereo format */
+ bool stereo_polarity; /* indicates left eye or right eye comes first in stereo mode */
+ enum dwb_stereo_eye_select stereo_eye_select; /* indicate which eye should be captured */
+};
+
struct dc_dwb_cnv_params {
unsigned int src_width; /* input active width */
unsigned int src_height; /* input active height (half-active height in interlaced mode) */
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h
index c3c7a34b0ab0..d4ae6eaaeb57 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h
@@ -81,16 +81,6 @@ enum dwb_frame_capture_enable {
DWB_FRAME_CAPTURE_ENABLE = 1,
};
-enum dwb_stereo_eye_select {
- DWB_STEREO_EYE_LEFT = 1, /* Capture left eye only */
- DWB_STEREO_EYE_RIGHT = 2, /* Capture right eye only */
-};
-
-enum dwb_stereo_type {
- DWB_STEREO_TYPE_FRAME_PACKING = 0, /* Frame packing */
- DWB_STEREO_TYPE_FRAME_SEQUENTIAL = 3, /* Frame sequential */
-};
-
enum wbscl_coef_filter_type_sel {
WBSCL_COEF_LUMA_VERT_FILTER = 0,
WBSCL_COEF_CHROMA_VERT_FILTER = 1,
@@ -101,13 +91,6 @@ enum wbscl_coef_filter_type_sel {
#endif
#if defined(CONFIG_DRM_AMD_DC_DCN2_0)
-struct dwb_stereo_params {
- bool stereo_enabled; /* false: normal mode, true: 3D stereo */
- enum dwb_stereo_type stereo_type; /* indicates stereo format */
- bool stereo_polarity; /* indicates left eye or right eye comes first in stereo mode */
- enum dwb_stereo_eye_select stereo_eye_select; /* indicate which eye should be captured */
-};
-
struct dwb_warmup_params {
bool warmup_en; /* false: normal mode, true: enable pattern generator */
bool warmup_mode; /* false: 420, true: 444 */
--
2.17.1
|
