Commit e1998c8c authored Jan 29, 2019 by Eric Bernstein Committed by Alex Deucher Mar 05, 2019

drm/amd/display: Move enum gamut_remap_select to hw_shared.h



This enum definition is shared, so move it to a shared location.

Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 68ea03a7

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -91,13 +91,6 @@ enum dscl_mode_sel {
	DSCL_MODE_DSCL_BYPASS = 6		DSCL_MODE_DSCL_BYPASS = 6
	};		};

	enum gamut_remap_select {
	GAMUT_REMAP_BYPASS = 0,
	GAMUT_REMAP_COEFF,
	GAMUT_REMAP_COMA_COEFF,
	GAMUT_REMAP_COMB_COEFF
	};

	void dpp_read_state(struct dpp *dpp_base,		void dpp_read_state(struct dpp *dpp_base,
	struct dcn_dpp_state *s)		struct dcn_dpp_state *s)
	{		{

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -88,13 +88,6 @@ enum dscl_mode_sel {
	DSCL_MODE_DSCL_BYPASS = 6		DSCL_MODE_DSCL_BYPASS = 6
	};		};

	enum gamut_remap_select {
	GAMUT_REMAP_BYPASS = 0,
	GAMUT_REMAP_COEFF,
	GAMUT_REMAP_COMA_COEFF,
	GAMUT_REMAP_COMB_COEFF
	};

	static const struct dpp_input_csc_matrix dpp_input_csc_matrix[] = {		static const struct dpp_input_csc_matrix dpp_input_csc_matrix[] = {
	{COLOR_SPACE_SRGB,		{COLOR_SPACE_SRGB,
	{0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} },		{0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} },

drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,12 @@ struct out_csc_color_matrix {
	uint16_t regval[12];		uint16_t regval[12];
	};		};

			enum gamut_remap_select {
			GAMUT_REMAP_BYPASS = 0,
			GAMUT_REMAP_COEFF,
			GAMUT_REMAP_COMA_COEFF,
			GAMUT_REMAP_COMB_COEFF
			};

	enum opp_regamma {		enum opp_regamma {
	OPP_REGAMMA_BYPASS = 0,		OPP_REGAMMA_BYPASS = 0,