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>

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 ea7a1c9efca8aea2bf9edf6cb5489981635e33e1..6b1431d63dabc7dcdb2d513f085ffde641cce437 100644 (file)
--- 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 5984be3cdf0cbf72d1cabf90db636b16677c43f7..7ce8d62ce5ae23702ce4bce5de8299fb3e49dbbc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -423,6 +423,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 c3c7a34b0ab0fd1da74cdfa95e28e60effc7f839..d4ae6eaaeb57ca533856f04b761cf3704bd6e863 100644 (file)
--- 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 */