Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "drm/amd/display: Rework YCbCr422 DSC policy"
Revert commit 19b79e4f2182 ("drm/amd/display: Rework YCbCr422 DSC policy")
Reason for Revert:
This commit is causing compliance failures
Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Relja Vojvodic <Relja.Vojvodic@amd.com>
Signed-off-by: Chuanyu Tseng <chuanyu.tseng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Relja Vojvodic
and committed by
Alex Deucher
246808e7
4d55784b
+18
-22
+1
-1
drivers/gpu/drm/amd/display/dc/dc.h
+1
-1
drivers/gpu/drm/amd/display/dc/dc.h
···
563
563
bool frame_update_cmd_version2;
564
564
struct spl_sharpness_range dcn_sharpness_range;
565
565
struct spl_sharpness_range dcn_override_sharpness_range;
566
-
bool no_native422_support;
567
566
};
568
567
569
568
enum visual_confirm {
···
987
988
* causing an issue or not.
988
989
*/
989
990
struct dc_debug_options {
991
+
bool native422_support;
990
992
bool disable_dsc;
991
993
enum visual_confirm visual_confirm;
992
994
int visual_confirm_rect_height;
-1
drivers/gpu/drm/amd/display/dc/dc_dsc.h
-1
drivers/gpu/drm/amd/display/dc/dc_dsc.h
+7
-6
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
+7
-6
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c
···
680
680
} else {
681
681
build_dsc_enc_caps(dsc, dsc_enc_caps);
682
682
}
683
+
684
+
if (dsc->ctx->dc->debug.native422_support)
685
+
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 1;
683
686
}
684
687
685
688
/* Returns 'false' if no intersection was found for at least one capability.
···
1100
1097
branch_max_throughput_mps = dsc_sink_caps->branch_overall_throughput_0_mps;
1101
1098
break;
1102
1099
case PIXEL_ENCODING_YCBCR422:
1103
-
if (policy.ycbcr422_simple) {
1100
+
is_dsc_possible = (bool)dsc_common_caps.color_formats.bits.YCBCR_NATIVE_422;
1101
+
sink_per_slice_throughput_mps = dsc_sink_caps->throughput_mode_1_mps;
1102
+
branch_max_throughput_mps = dsc_sink_caps->branch_overall_throughput_1_mps;
1103
+
if (!is_dsc_possible) {
1104
1104
is_dsc_possible = (bool)dsc_common_caps.color_formats.bits.YCBCR_SIMPLE_422;
1105
1105
dsc_cfg->ycbcr422_simple = is_dsc_possible;
1106
1106
sink_per_slice_throughput_mps = dsc_sink_caps->throughput_mode_0_mps;
1107
-
} else {
1108
-
is_dsc_possible = (bool)dsc_common_caps.color_formats.bits.YCBCR_NATIVE_422;
1109
-
sink_per_slice_throughput_mps = dsc_sink_caps->throughput_mode_1_mps;
1110
-
branch_max_throughput_mps = dsc_sink_caps->branch_overall_throughput_1_mps;
1111
1107
}
1112
1108
break;
1113
1109
case PIXEL_ENCODING_YCBCR420:
···
1406
1404
policy->min_target_bpp = 8;
1407
1405
/* DP specs limits to 3 x bpc */
1408
1406
policy->max_target_bpp = 3 * bpc;
1409
-
policy->ycbcr422_simple = true;
1410
1407
break;
1411
1408
case PIXEL_ENCODING_YCBCR420:
1412
1409
/* DP specs limits to 6 */
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c
···
100
100
dsc_enc_caps->color_formats.bits.RGB = 1;
101
101
dsc_enc_caps->color_formats.bits.YCBCR_444 = 1;
102
102
dsc_enc_caps->color_formats.bits.YCBCR_SIMPLE_422 = 1;
103
-
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 1;
103
+
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 0;
104
104
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_420 = 1;
105
105
106
106
dsc_enc_caps->color_depth.bits.COLOR_DEPTH_8_BPC = 1;
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c
···
128
128
dsc_enc_caps->color_formats.bits.RGB = 1;
129
129
dsc_enc_caps->color_formats.bits.YCBCR_444 = 1;
130
130
dsc_enc_caps->color_formats.bits.YCBCR_SIMPLE_422 = 1;
131
-
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 1;
131
+
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 0;
132
132
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_420 = 1;
133
133
134
134
dsc_enc_caps->color_depth.bits.COLOR_DEPTH_8_BPC = 1;
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c
+1
-1
drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c
···
78
78
dsc_enc_caps->color_formats.bits.RGB = 1;
79
79
dsc_enc_caps->color_formats.bits.YCBCR_444 = 1;
80
80
dsc_enc_caps->color_formats.bits.YCBCR_SIMPLE_422 = 1;
81
-
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 1;
81
+
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_422 = 0;
82
82
dsc_enc_caps->color_formats.bits.YCBCR_NATIVE_420 = 1;
83
83
84
84
dsc_enc_caps->color_depth.bits.COLOR_DEPTH_8_BPC = 1;
+6
-5
drivers/gpu/drm/amd/display/dc/link/link_detection.c
+6
-5
drivers/gpu/drm/amd/display/dc/link/link_detection.c
···
781
781
}
782
782
783
783
static void verify_link_capability_destructive(struct dc_link *link,
784
+
struct dc_sink *sink,
784
785
enum dc_detect_reason reason)
785
786
{
787
+
(void)sink;
786
788
bool should_prepare_phy_clocks =
787
789
should_prepare_phy_clocks_for_link_verification(link->dc, reason);
788
790
···
856
854
return destrictive;
857
855
}
858
856
859
-
static void verify_link_capability(struct dc_link *link,
857
+
static void verify_link_capability(struct dc_link *link, struct dc_sink *sink,
860
858
enum dc_detect_reason reason)
861
859
{
862
860
if (should_verify_link_capability_destructively(link, reason))
863
-
verify_link_capability_destructive(link, reason);
861
+
verify_link_capability_destructive(link, sink, reason);
864
862
else
865
863
verify_link_capability_non_destructive(link);
866
864
}
···
1454
1452
1455
1453
is_local_sink_detect_success = detect_link_and_local_sink(link, reason);
1456
1454
1457
-
if (is_local_sink_detect_success && link->local_sink) {
1458
-
verify_link_capability(link, reason);
1459
-
}
1455
+
if (is_local_sink_detect_success && link->local_sink)
1456
+
verify_link_capability(link, link->local_sink, reason);
1460
1457
1461
1458
DC_LOG_DC("%s: link_index=%d is_local_sink_detect_success=%d pre_link_type=%d link_type=%d\n", __func__,
1462
1459
link->link_index, is_local_sink_detect_success, pre_link_type, link->type);
+1
-2
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
+1
-2
drivers/gpu/drm/amd/display/dc/link/link_dpms.c
···
181
181
/* link can be also enabled by vbios. In this case it is not recorded
182
182
* in pipe_ctx. Disable link phy here to make sure it is completely off
183
183
*/
184
-
if (dc_is_dp_signal(link->connector_signal))
185
-
dp_disable_link_phy(link, &link_res, link->connector_signal);
184
+
dp_disable_link_phy(link, &link_res, link->connector_signal);
186
185
}
187
186
188
187
void link_resume(struct dc_link *link)
-2
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
-2
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
-2
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
-2
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c