diff options
| author | Vitaly Prosyak <vitaly.prosyak@amd.com> | 2017-06-12 11:03:26 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:08:03 -0400 |
| commit | b6d6103bbb21ed51acf0168529d867df1ecde445 (patch) | |
| tree | 84d9e48558e0adbe0309867cbe003ce7218e3861 /drivers/gpu | |
| parent | c8210d5ae37b3c0e5dc2a91095dd1147c524977d (diff) | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc.h | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 43 | ||||
| -rw-r--r-- | 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 fb86808dd309..a78af1ef1315 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 b6e677786cbc..94fb93066784 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 5269796b2a8e..9662f2c68f83 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, |