diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1293-drm-amd-display-Move-enum-gamut_remap_select-to-hw_s.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1293-drm-amd-display-Move-enum-gamut_remap_select-to-hw_s.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1293-drm-amd-display-Move-enum-gamut_remap_select-to-hw_s.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1293-drm-amd-display-Move-enum-gamut_remap_select-to-hw_s.patch new file mode 100644 index 00000000..489a2f29 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/1293-drm-amd-display-Move-enum-gamut_remap_select-to-hw_s.patch @@ -0,0 +1,73 @@ +From d156c68b13a1f384ef9fecdc319c77866ab15bd0 Mon Sep 17 00:00:00 2001 +From: Eric Bernstein <eric.bernstein@amd.com> +Date: Tue, 29 Jan 2019 16:20:26 -0500 +Subject: [PATCH 1293/2940] 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> +--- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 7 ------- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 7 ------- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 6 ++++++ + 3 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +index cd1ebe57ed59..f91e4b49d211 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +@@ -91,13 +91,6 @@ enum dscl_mode_sel { + 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, + struct dcn_dpp_state *s) + { +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c +index 41f0f4c912e7..882bcc5a40f6 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c +@@ -88,13 +88,6 @@ enum dscl_mode_sel { + 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[] = { + {COLOR_SPACE_SRGB, + {0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} }, +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +index da85537a4488..4c8e2c6fb6db 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +@@ -146,6 +146,12 @@ struct out_csc_color_matrix { + 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 { + OPP_REGAMMA_BYPASS = 0, +-- +2.17.1 + |