diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0123-drm-amd-display-Fix-warnings-in-DC.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0123-drm-amd-display-Fix-warnings-in-DC.patch | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0123-drm-amd-display-Fix-warnings-in-DC.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0123-drm-amd-display-Fix-warnings-in-DC.patch new file mode 100644 index 00000000..051042bf --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0123-drm-amd-display-Fix-warnings-in-DC.patch @@ -0,0 +1,113 @@ +From 165c26c12272d5846edd08715d53cf319c64dca0 Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Wed, 4 Jan 2017 18:48:07 -0500 +Subject: [PATCH 0123/4131] drm/amd/display: Fix warnings in DC + +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 9 ++++----- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 6 ------ + drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 1 - + drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp_gamma.c | 2 -- + 4 files changed, 4 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index 2b08f5a..3e33795 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -1731,14 +1731,15 @@ static void set_hdr_static_info_packet( + struct core_stream *stream, + struct hw_info_packet *info_packet) + { +- uint16_t i; ++ uint16_t i = 0; + enum signal_type signal = stream->signal; ++ struct dc_hdr_static_metadata hdr_metadata; ++ uint32_t data; + + if (!surface) + return; + +- struct dc_hdr_static_metadata hdr_metadata = +- surface->public.hdr_static_ctx; ++ hdr_metadata = surface->public.hdr_static_ctx; + + if (dc_is_hdmi_signal(signal)) { + info_packet->valid = true; +@@ -1757,8 +1758,6 @@ static void set_hdr_static_info_packet( + i = 2; + } + +- uint32_t data; +- + data = hdr_metadata.is_hdr; + info_packet->sb[i++] = data ? 0x02 : 0x00; + info_packet->sb[i++] = 0x00; +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c +index 46b1287..167f523 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.c +@@ -119,7 +119,6 @@ static void regamma_config_regions_and_segments( + const struct pwl_params *params) + { + const struct gamma_curve *curve; +- uint32_t value = 0; + + { + REG_SET_2(REGAMMA_CNTLA_START_CNTL, 0, +@@ -565,8 +564,6 @@ void dce110_opp_set_clamping( + struct dce110_opp *opp110, + const struct clamping_and_pixel_encoding_params *params) + { +- uint32_t clamp_cntl_value = 0; +- + REG_SET_2(FMT_CLAMP_CNTL, 0, + FMT_CLAMP_DATA_EN, 0, + FMT_CLAMP_COLOR_FORMAT, 0); +@@ -731,7 +728,6 @@ void dce110_opp_set_dyn_expansion( + static void program_formatter_reset_dig_resync_fifo(struct output_pixel_processor *opp) + { + struct dce110_opp *opp110 = TO_DCE110_OPP(opp); +- uint8_t counter = 10; + + /* clear previous phase lock status*/ + REG_UPDATE(FMT_CONTROL, +@@ -810,8 +806,6 @@ static bool configure_graphics_mode( + enum graphics_csc_adjust_type csc_adjust_type, + enum dc_color_space color_space) + { +- struct dc_context *ctx = opp110->base.ctx; +- + REG_SET(OUTPUT_CSC_CONTROL, 0, + OUTPUT_CSC_GRPH_MODE, 0); + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 6a7cb3e..2b61fdf 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -293,7 +293,6 @@ static bool dce110_set_output_transfer_func( + { + struct output_pixel_processor *opp = pipe_ctx->opp; + const struct core_gamma *ramp = NULL; +- struct ipp_prescale_params prescale_params = { 0 }; + struct pwl_params *regamma_params; + bool result = false; + +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp_gamma.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp_gamma.c +index c68914b..f05cc9e 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp_gamma.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_ipp_gamma.c +@@ -72,8 +72,6 @@ bool dce110_ipp_set_degamma( + { + struct dce110_ipp *ipp110 = TO_DCE110_IPP(ipp); + +- uint32_t value = 0; +- + uint32_t degamma_type = (mode == IPP_DEGAMMA_MODE_HW_sRGB) ? 1 : 0; + + ASSERT(mode == IPP_DEGAMMA_MODE_BYPASS || +-- +2.7.4 + |