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>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index fb86808dd309c61c0e3cb07d7e042144e69ceb7c..a78af1ef13159fa9ccd8283bc9c4dc54c4ff9078 100644 (file)
--- 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 b6e677786cbcec27d81e17626c14a2b742187c59..94fb930667849e5fa5ef3c0b0670883479090e2e 100644 (file)
--- 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 5269796b2a8ef28999d9841415053c93ef05a49e..9662f2c68f838ba517344c490e241cf6c1a571be 100644 (file)
--- 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,