Skip to content

L
linux
Commit 9983b800 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files
Options

drm/amd/display: dp interlace MSA timing programming for Interlace mode. 

[Why]
DP compliance box shows wrong MSA data.
Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 570744b9
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 56 deletions
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
View file @ 9983b800
...@@ -288,9 +288,18 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -288,9 +288,18 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
#endif #endif
struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc); struct dce110_stream_encoder *enc110 = DCE110STRENC_FROM_STRENC(enc);
struct dc_crtc_timing hw_crtc_timing = *crtc_timing;
if (hw_crtc_timing.flags.INTERLACE) {
/*the input timing is in VESA spec format with Interlace flag =1*/
hw_crtc_timing.v_total /= 2;
hw_crtc_timing.v_border_top /= 2;
hw_crtc_timing.v_addressable /= 2;
hw_crtc_timing.v_border_bottom /= 2;
hw_crtc_timing.v_front_porch /= 2;
hw_crtc_timing.v_sync_width /= 2;
}
/* set pixel encoding */ /* set pixel encoding */
switch (crtc_timing->pixel_encoding) { switch (hw_crtc_timing.pixel_encoding) {
case PIXEL_ENCODING_YCBCR422: case PIXEL_ENCODING_YCBCR422:
REG_UPDATE(DP_PIXEL_FORMAT, DP_PIXEL_ENCODING, REG_UPDATE(DP_PIXEL_FORMAT, DP_PIXEL_ENCODING,
DP_PIXEL_ENCODING_TYPE_YCBCR422); DP_PIXEL_ENCODING_TYPE_YCBCR422);
...@@ -299,8 +308,8 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -299,8 +308,8 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
REG_UPDATE(DP_PIXEL_FORMAT, DP_PIXEL_ENCODING, REG_UPDATE(DP_PIXEL_FORMAT, DP_PIXEL_ENCODING,
DP_PIXEL_ENCODING_TYPE_YCBCR444); DP_PIXEL_ENCODING_TYPE_YCBCR444);
if (crtc_timing->flags.Y_ONLY) if (hw_crtc_timing.flags.Y_ONLY)
if (crtc_timing->display_color_depth != COLOR_DEPTH_666) if (hw_crtc_timing.display_color_depth != COLOR_DEPTH_666)
/* HW testing only, no use case yet. /* HW testing only, no use case yet.
* Color depth of Y-only could be * Color depth of Y-only could be
* 8, 10, 12, 16 bits */ * 8, 10, 12, 16 bits */
...@@ -335,7 +344,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -335,7 +344,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
/* set color depth */ /* set color depth */
switch (crtc_timing->display_color_depth) { switch (hw_crtc_timing.display_color_depth) {
case COLOR_DEPTH_666: case COLOR_DEPTH_666:
REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH, REG_UPDATE(DP_PIXEL_FORMAT, DP_COMPONENT_DEPTH,
0); 0);
...@@ -363,7 +372,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -363,7 +372,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
switch (crtc_timing->display_color_depth) { switch (hw_crtc_timing.display_color_depth) {
case COLOR_DEPTH_666: case COLOR_DEPTH_666:
colorimetry_bpc = 0; colorimetry_bpc = 0;
break; break;
...@@ -401,9 +410,9 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -401,9 +410,9 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
misc0 = misc0 | 0x8; /* bit3=1, bit4=0 */ misc0 = misc0 | 0x8; /* bit3=1, bit4=0 */
misc1 = misc1 & ~0x80; /* bit7 = 0*/ misc1 = misc1 & ~0x80; /* bit7 = 0*/
dynamic_range_ycbcr = 0; /*bt601*/ dynamic_range_ycbcr = 0; /*bt601*/
if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR422) if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR422)
misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */ misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */
else if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR444) else if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR444)
misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */ misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */
break; break;
case COLOR_SPACE_YCBCR709: case COLOR_SPACE_YCBCR709:
...@@ -411,9 +420,9 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -411,9 +420,9 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
misc0 = misc0 | 0x18; /* bit3=1, bit4=1 */ misc0 = misc0 | 0x18; /* bit3=1, bit4=1 */
misc1 = misc1 & ~0x80; /* bit7 = 0*/ misc1 = misc1 & ~0x80; /* bit7 = 0*/
dynamic_range_ycbcr = 1; /*bt709*/ dynamic_range_ycbcr = 1; /*bt709*/
if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR422) if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR422)
misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */ misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */
else if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR444) else if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR444)
misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */ misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */
break; break;
case COLOR_SPACE_2020_RGB_LIMITEDRANGE: case COLOR_SPACE_2020_RGB_LIMITEDRANGE:
...@@ -453,27 +462,27 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -453,27 +462,27 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
*/ */
if (REG(DP_MSA_TIMING_PARAM1)) if (REG(DP_MSA_TIMING_PARAM1))
REG_SET_2(DP_MSA_TIMING_PARAM1, 0, REG_SET_2(DP_MSA_TIMING_PARAM1, 0,
DP_MSA_HTOTAL, crtc_timing->h_total, DP_MSA_HTOTAL, hw_crtc_timing.h_total,
DP_MSA_VTOTAL, crtc_timing->v_total); DP_MSA_VTOTAL, hw_crtc_timing.v_total);
#endif #endif
/* calcuate from vesa timing parameters /* calcuate from vesa timing parameters
* h_active_start related to leading edge of sync * h_active_start related to leading edge of sync
*/ */
h_blank = crtc_timing->h_total - crtc_timing->h_border_left - h_blank = hw_crtc_timing.h_total - hw_crtc_timing.h_border_left -
crtc_timing->h_addressable - crtc_timing->h_border_right; hw_crtc_timing.h_addressable - hw_crtc_timing.h_border_right;
h_back_porch = h_blank - crtc_timing->h_front_porch - h_back_porch = h_blank - hw_crtc_timing.h_front_porch -
crtc_timing->h_sync_width; hw_crtc_timing.h_sync_width;
/* start at begining of left border */ /* start at begining of left border */
h_active_start = crtc_timing->h_sync_width + h_back_porch; h_active_start = hw_crtc_timing.h_sync_width + h_back_porch;
v_active_start = crtc_timing->v_total - crtc_timing->v_border_top - v_active_start = hw_crtc_timing.v_total - hw_crtc_timing.v_border_top -
crtc_timing->v_addressable - crtc_timing->v_border_bottom - hw_crtc_timing.v_addressable - hw_crtc_timing.v_border_bottom -
crtc_timing->v_front_porch; hw_crtc_timing.v_front_porch;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
...@@ -486,21 +495,21 @@ static void dce110_stream_encoder_dp_set_stream_attribute( ...@@ -486,21 +495,21 @@ static void dce110_stream_encoder_dp_set_stream_attribute(
if (REG(DP_MSA_TIMING_PARAM3)) if (REG(DP_MSA_TIMING_PARAM3))
REG_SET_4(DP_MSA_TIMING_PARAM3, 0, REG_SET_4(DP_MSA_TIMING_PARAM3, 0,
DP_MSA_HSYNCWIDTH, DP_MSA_HSYNCWIDTH,
crtc_timing->h_sync_width, hw_crtc_timing.h_sync_width,
DP_MSA_HSYNCPOLARITY, DP_MSA_HSYNCPOLARITY,
!crtc_timing->flags.HSYNC_POSITIVE_POLARITY, !hw_crtc_timing.flags.HSYNC_POSITIVE_POLARITY,
DP_MSA_VSYNCWIDTH, DP_MSA_VSYNCWIDTH,
crtc_timing->v_sync_width, hw_crtc_timing.v_sync_width,
DP_MSA_VSYNCPOLARITY, DP_MSA_VSYNCPOLARITY,
!crtc_timing->flags.VSYNC_POSITIVE_POLARITY); !hw_crtc_timing.flags.VSYNC_POSITIVE_POLARITY);
/* HWDITH include border or overscan */ /* HWDITH include border or overscan */
if (REG(DP_MSA_TIMING_PARAM4)) if (REG(DP_MSA_TIMING_PARAM4))
REG_SET_2(DP_MSA_TIMING_PARAM4, 0, REG_SET_2(DP_MSA_TIMING_PARAM4, 0,
DP_MSA_HWIDTH, crtc_timing->h_border_left + DP_MSA_HWIDTH, hw_crtc_timing.h_border_left +
crtc_timing->h_addressable + crtc_timing->h_border_right, hw_crtc_timing.h_addressable + hw_crtc_timing.h_border_right,
DP_MSA_VHEIGHT, crtc_timing->v_border_top + DP_MSA_VHEIGHT, hw_crtc_timing.v_border_top +
crtc_timing->v_addressable + crtc_timing->v_border_bottom); hw_crtc_timing.v_addressable + hw_crtc_timing.v_border_bottom);
#endif #endif
} }
#endif #endif
......
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
View file @ 9983b800
...@@ -261,17 +261,29 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -261,17 +261,29 @@ void enc1_stream_encoder_dp_set_stream_attribute(
uint8_t dp_component_depth = 0; uint8_t dp_component_depth = 0;
struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc); struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
struct dc_crtc_timing hw_crtc_timing = *crtc_timing;
if (hw_crtc_timing.flags.INTERLACE) {
/*the input timing is in VESA spec format with Interlace flag =1*/
hw_crtc_timing.v_total /= 2;
hw_crtc_timing.v_border_top /= 2;
hw_crtc_timing.v_addressable /= 2;
hw_crtc_timing.v_border_bottom /= 2;
hw_crtc_timing.v_front_porch /= 2;
hw_crtc_timing.v_sync_width /= 2;
}
/* set pixel encoding */ /* set pixel encoding */
switch (crtc_timing->pixel_encoding) { switch (hw_crtc_timing.pixel_encoding) {
case PIXEL_ENCODING_YCBCR422: case PIXEL_ENCODING_YCBCR422:
dp_pixel_encoding = DP_PIXEL_ENCODING_TYPE_YCBCR422; dp_pixel_encoding = DP_PIXEL_ENCODING_TYPE_YCBCR422;
break; break;
case PIXEL_ENCODING_YCBCR444: case PIXEL_ENCODING_YCBCR444:
dp_pixel_encoding = DP_PIXEL_ENCODING_TYPE_YCBCR444; dp_pixel_encoding = DP_PIXEL_ENCODING_TYPE_YCBCR444;
if (crtc_timing->flags.Y_ONLY) if (hw_crtc_timing.flags.Y_ONLY)
if (crtc_timing->display_color_depth != COLOR_DEPTH_666) if (hw_crtc_timing.display_color_depth != COLOR_DEPTH_666)
/* HW testing only, no use case yet. /* HW testing only, no use case yet.
* Color depth of Y-only could be * Color depth of Y-only could be
* 8, 10, 12, 16 bits * 8, 10, 12, 16 bits
...@@ -299,7 +311,7 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -299,7 +311,7 @@ void enc1_stream_encoder_dp_set_stream_attribute(
* Pixel Encoding/Colorimetry Format and that a Sink device shall ignore MISC1, bit 7, * Pixel Encoding/Colorimetry Format and that a Sink device shall ignore MISC1, bit 7,
* and MISC0, bits 7:1 (MISC1, bit 7, and MISC0, bits 7:1, become "don't care"). * and MISC0, bits 7:1 (MISC1, bit 7, and MISC0, bits 7:1, become "don't care").
*/ */
if ((crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420) || if ((hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR420) ||
(output_color_space == COLOR_SPACE_2020_YCBCR) || (output_color_space == COLOR_SPACE_2020_YCBCR) ||
(output_color_space == COLOR_SPACE_2020_RGB_FULLRANGE) || (output_color_space == COLOR_SPACE_2020_RGB_FULLRANGE) ||
(output_color_space == COLOR_SPACE_2020_RGB_LIMITEDRANGE)) (output_color_space == COLOR_SPACE_2020_RGB_LIMITEDRANGE))
...@@ -308,7 +320,7 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -308,7 +320,7 @@ void enc1_stream_encoder_dp_set_stream_attribute(
misc1 = misc1 & ~0x40; misc1 = misc1 & ~0x40;
/* set color depth */ /* set color depth */
switch (crtc_timing->display_color_depth) { switch (hw_crtc_timing.display_color_depth) {
case COLOR_DEPTH_666: case COLOR_DEPTH_666:
dp_component_depth = DP_COMPONENT_PIXEL_DEPTH_6BPC; dp_component_depth = DP_COMPONENT_PIXEL_DEPTH_6BPC;
break; break;
...@@ -336,7 +348,7 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -336,7 +348,7 @@ void enc1_stream_encoder_dp_set_stream_attribute(
/* set dynamic range and YCbCr range */ /* set dynamic range and YCbCr range */
switch (crtc_timing->display_color_depth) { switch (hw_crtc_timing.display_color_depth) {
case COLOR_DEPTH_666: case COLOR_DEPTH_666:
colorimetry_bpc = 0; colorimetry_bpc = 0;
break; break;
...@@ -372,9 +384,9 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -372,9 +384,9 @@ void enc1_stream_encoder_dp_set_stream_attribute(
misc0 = misc0 | 0x8; /* bit3=1, bit4=0 */ misc0 = misc0 | 0x8; /* bit3=1, bit4=0 */
misc1 = misc1 & ~0x80; /* bit7 = 0*/ misc1 = misc1 & ~0x80; /* bit7 = 0*/
dynamic_range_ycbcr = 0; /*bt601*/ dynamic_range_ycbcr = 0; /*bt601*/
if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR422) if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR422)
misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */ misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */
else if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR444) else if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR444)
misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */ misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */
break; break;
case COLOR_SPACE_YCBCR709: case COLOR_SPACE_YCBCR709:
...@@ -382,9 +394,9 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -382,9 +394,9 @@ void enc1_stream_encoder_dp_set_stream_attribute(
misc0 = misc0 | 0x18; /* bit3=1, bit4=1 */ misc0 = misc0 | 0x18; /* bit3=1, bit4=1 */
misc1 = misc1 & ~0x80; /* bit7 = 0*/ misc1 = misc1 & ~0x80; /* bit7 = 0*/
dynamic_range_ycbcr = 1; /*bt709*/ dynamic_range_ycbcr = 1; /*bt709*/
if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR422) if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR422)
misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */ misc0 = misc0 | 0x2; /* bit2=0, bit1=1 */
else if (crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR444) else if (hw_crtc_timing.pixel_encoding == PIXEL_ENCODING_YCBCR444)
misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */ misc0 = misc0 | 0x4; /* bit2=1, bit1=0 */
break; break;
case COLOR_SPACE_2020_RGB_LIMITEDRANGE: case COLOR_SPACE_2020_RGB_LIMITEDRANGE:
...@@ -414,26 +426,26 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -414,26 +426,26 @@ void enc1_stream_encoder_dp_set_stream_attribute(
* dc_crtc_timing is vesa dmt struct. data from edid * dc_crtc_timing is vesa dmt struct. data from edid
*/ */
REG_SET_2(DP_MSA_TIMING_PARAM1, 0, REG_SET_2(DP_MSA_TIMING_PARAM1, 0,
DP_MSA_HTOTAL, crtc_timing->h_total, DP_MSA_HTOTAL, hw_crtc_timing.h_total,
DP_MSA_VTOTAL, crtc_timing->v_total); DP_MSA_VTOTAL, hw_crtc_timing.v_total);
/* calculate from vesa timing parameters /* calculate from vesa timing parameters
* h_active_start related to leading edge of sync * h_active_start related to leading edge of sync
*/ */
h_blank = crtc_timing->h_total - crtc_timing->h_border_left - h_blank = hw_crtc_timing.h_total - hw_crtc_timing.h_border_left -
crtc_timing->h_addressable - crtc_timing->h_border_right; hw_crtc_timing.h_addressable - hw_crtc_timing.h_border_right;
h_back_porch = h_blank - crtc_timing->h_front_porch - h_back_porch = h_blank - hw_crtc_timing.h_front_porch -
crtc_timing->h_sync_width; hw_crtc_timing.h_sync_width;
/* start at beginning of left border */ /* start at beginning of left border */
h_active_start = crtc_timing->h_sync_width + h_back_porch; h_active_start = hw_crtc_timing.h_sync_width + h_back_porch;
v_active_start = crtc_timing->v_total - crtc_timing->v_border_top - v_active_start = hw_crtc_timing.v_total - hw_crtc_timing.v_border_top -
crtc_timing->v_addressable - crtc_timing->v_border_bottom - hw_crtc_timing.v_addressable - hw_crtc_timing.v_border_bottom -
crtc_timing->v_front_porch; hw_crtc_timing.v_front_porch;
/* start at beginning of left border */ /* start at beginning of left border */
...@@ -443,20 +455,20 @@ void enc1_stream_encoder_dp_set_stream_attribute( ...@@ -443,20 +455,20 @@ void enc1_stream_encoder_dp_set_stream_attribute(
REG_SET_4(DP_MSA_TIMING_PARAM3, 0, REG_SET_4(DP_MSA_TIMING_PARAM3, 0,
DP_MSA_HSYNCWIDTH, DP_MSA_HSYNCWIDTH,
crtc_timing->h_sync_width, hw_crtc_timing.h_sync_width,
DP_MSA_HSYNCPOLARITY, DP_MSA_HSYNCPOLARITY,
!crtc_timing->flags.HSYNC_POSITIVE_POLARITY, !hw_crtc_timing.flags.HSYNC_POSITIVE_POLARITY,
DP_MSA_VSYNCWIDTH, DP_MSA_VSYNCWIDTH,
crtc_timing->v_sync_width, hw_crtc_timing.v_sync_width,
DP_MSA_VSYNCPOLARITY, DP_MSA_VSYNCPOLARITY,
!crtc_timing->flags.VSYNC_POSITIVE_POLARITY); !hw_crtc_timing.flags.VSYNC_POSITIVE_POLARITY);
/* HWDITH include border or overscan */ /* HWDITH include border or overscan */
REG_SET_2(DP_MSA_TIMING_PARAM4, 0, REG_SET_2(DP_MSA_TIMING_PARAM4, 0,
DP_MSA_HWIDTH, crtc_timing->h_border_left + DP_MSA_HWIDTH, hw_crtc_timing.h_border_left +
crtc_timing->h_addressable + crtc_timing->h_border_right, hw_crtc_timing.h_addressable + hw_crtc_timing.h_border_right,
DP_MSA_VHEIGHT, crtc_timing->v_border_top + DP_MSA_VHEIGHT, hw_crtc_timing.v_border_top +
crtc_timing->v_addressable + crtc_timing->v_border_bottom); hw_crtc_timing.v_addressable + hw_crtc_timing.v_border_bottom);
} }
static void enc1_stream_encoder_set_stream_attribute_helper( static void enc1_stream_encoder_set_stream_attribute_helper(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7