Commit e0df49b3 authored by Ethan Wellenreiter's avatar Ethan Wellenreiter Committed by Alex Deucher
Browse files

drm/amd/display: reverted limiting vscsdp_for_colorimetry and ARGB16161616 pixel format addition 



[WHY]
Limiting vscsdp_for_colorimetry for YCbCr420/BT2020 resulted in red/green
point failures in HDR10 DTN tests. The re-implementation of ARGB16161616
was to fix this however it did not actually fix this issue but a side effect of the
issue.

[HOW]
Change ARGB16161616 pixel format to 26.

Reviewed-by: default avatarMartin Leung <Martin.Leung@amd.com>
Acked-by: default avatarBrian Chang <Brian.Chang@amd.com>
Signed-off-by: default avatarEthan Wellenreiter <Ethan.Wellenreiter@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5a0918b4

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c

+0 −2
Original line number Diff line number Diff line
@@ -361,8 +361,6 @@ void dpp1_cnv_setup ( 
		select = INPUT_CSC_SELECT_ICSC;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:

		pixel_format = 22;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616:

		pixel_format = 26; /* ARGB16161616_UNORM */

		break;

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c

+0 −3
Original line number Diff line number Diff line
@@ -278,9 +278,6 @@ void hubp1_program_pixel_format( 
				SURFACE_PIXEL_FORMAT, 10);

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:

		REG_UPDATE(DCSURF_SURFACE_CONFIG,

				SURFACE_PIXEL_FORMAT, 22);

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616: /*we use crossbar already*/

		REG_UPDATE(DCSURF_SURFACE_CONFIG,

				SURFACE_PIXEL_FORMAT, 26); /* ARGB16161616_UNORM */

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c

+0 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ static void dpp2_cnv_setup ( 
		select = DCN2_ICSC_SELECT_ICSC_A;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:

		pixel_format = 22;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616:

		pixel_format = 26; /* ARGB16161616_UNORM */

		break;

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c

+0 −3
Original line number Diff line number Diff line
@@ -463,9 +463,6 @@ void hubp2_program_pixel_format( 
				SURFACE_PIXEL_FORMAT, 10);

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:

		REG_UPDATE(DCSURF_SURFACE_CONFIG,

				SURFACE_PIXEL_FORMAT, 22);

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616: /*we use crossbar already*/

		REG_UPDATE(DCSURF_SURFACE_CONFIG,

				SURFACE_PIXEL_FORMAT, 26); /* ARGB16161616_UNORM */

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c

+0 −2
Original line number Diff line number Diff line
@@ -244,8 +244,6 @@ void dpp3_cnv_setup ( 
		select = INPUT_CSC_SELECT_ICSC;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:

		pixel_format = 22;

		break;

	case SURFACE_PIXEL_FORMAT_GRPH_ABGR16161616:

		pixel_format = 26; /* ARGB16161616_UNORM */

		break;