lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 100/434] drm/amd/display: fix struct init in update_bounding_box
    Date
    From: Raul E Rangel <rrangel@chromium.org>

    [ Upstream commit 960b6f4f2d2e96d5f7ffe2854e0040b46cafbd36 ]

    dcn20_resource.c:2636:9: error: missing braces around initializer [-Werror=missing-braces]
    struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES] = {0};
    ^

    Fixes: 7ed4e6352c16f ("drm/amd/display: Add DCN2 HW Sequencer and Resource")

    Signed-off-by: Raul E Rangel <rrangel@chromium.org>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
    index ebe67c34dabf..78b2cc2e122f 100644
    --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
    +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
    @@ -3041,7 +3041,7 @@ static void cap_soc_clocks(
    static void update_bounding_box(struct dc *dc, struct _vcs_dpi_soc_bounding_box_st *bb,
    struct pp_smu_nv_clock_table *max_clocks, unsigned int *uclk_states, unsigned int num_states)
    {
    - struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES] = {0};
    + struct _vcs_dpi_voltage_scaling_st calculated_states[MAX_CLOCK_LIMIT_STATES];
    int i;
    int num_calculated_states = 0;
    int min_dcfclk = 0;
    @@ -3049,6 +3049,8 @@ static void update_bounding_box(struct dc *dc, struct _vcs_dpi_soc_bounding_box_
    if (num_states == 0)
    return;

    + memset(calculated_states, 0, sizeof(calculated_states));
    +
    if (dc->bb_overrides.min_dcfclk_mhz > 0)
    min_dcfclk = dc->bb_overrides.min_dcfclk_mhz;
    else
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:10    [W:2.185 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site