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

drm/amd/display: Re-implementing ARGB16161616 pixel format as 22 



[Why]
ABGR16161616 colour format was added to dcn10/20/30, and set
any ARGB16161616 to the same value as it (26). As such, the
HDR10 Green Point y value was too far off of the EDID stated
value for DisplayPort.

[How]
Added back the pixel format as 22 for ARGB16161616 for
dcn10/20/30.

Reviewed-by: default avatarReza Amini <reza.amini@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@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 78486da8

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

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@ 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;