drm/amd/display: Some more warning fixes

This doesn't show with gcc6

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 8eb6b342a49da31b0cc1f9b279c37a460f92dff3..d275fc88f71e20c299de46286ff5ed49c1e25699 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -928,7 +928,7 @@ static bool construct(
 {
        uint8_t i;
        struct gpio *hpd_gpio = NULL;
-       struct ddc_service_init_data ddc_service_init_data = { 0 };
+       struct ddc_service_init_data ddc_service_init_data = { { 0 } };
        struct dc_context *dc_ctx = init_params->ctx;
        struct encoder_init_data enc_init_data = { 0 };
        struct integrated_info info = {{{ 0 }}};

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 6fe5acbc16ca02ed468f7af5ec468540595f03af..37efa40a9bcaea64a04482729be9f4d3370abda1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -1762,7 +1762,7 @@ bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link)
 {
        struct core_link *link = DC_LINK_TO_LINK(dc_link);
        union hpd_irq_data hpd_irq_dpcd_data = {{{{0}}}};
-       union device_service_irq device_service_clear = {0};
+       union device_service_irq device_service_clear = { { 0 } };
        enum dc_status result = DDC_RESULT_UNKNOWN;
        bool status = false;
        /* For use cases related to down stream connection status change,

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index dd922bdcc145d7890c4efdde95751ce01d454bd5..3e3eefea3e82dce02b1901d62061064515099b98 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -393,8 +393,8 @@ static void dce_clock_read_integrated_info(struct dce_disp_clk *clk_dce)
 {
        struct dc_debug *debug = &clk_dce->base.ctx->dc->debug;
        struct dc_bios *bp = clk_dce->base.ctx->dc_bios;
-       struct integrated_info info = { 0 };
-       struct firmware_info fw_info = { 0 };
+       struct integrated_info info = { { { 0 } } };
+       struct firmware_info fw_info = { { 0 } };
        int i;
 
        if (bp->integrated_info)
@@ -456,7 +456,7 @@ static void dce_clock_read_ss_info(struct dce_disp_clk *clk_dce)
                        bp, AS_SIGNAL_TYPE_GPU_PLL);
 
        if (ss_info_num) {
-               struct spread_spectrum_info info = { 0 };
+               struct spread_spectrum_info info = { { 0 } };
                enum bp_result result = bp->funcs->get_spread_spectrum_info(
                                bp, AS_SIGNAL_TYPE_GPU_PLL, 0, &info);