lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 212/257] drm/amd/display: Check for null fclk voltage when parsing clock table
    Date
    From: Michael Strauss <michael.strauss@amd.com>

    commit 72f5b5a308c744573fdbc6c78202c52196d2c162 upstream.

    [WHY]
    In cases where a clock table is malformed such that fclk entries have
    frequencies but not voltages listed, we don't catch the error and set
    clocks to 0 instead of using hardcoded values as we should.

    [HOW]
    Add check for clock tables fclk entry's voltage as well

    Signed-off-by: Michael Strauss <michael.strauss@amd.com>
    Reviewed-by: Eric Yang <eric.yang2@amd.com>
    Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
    +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
    @@ -641,7 +641,7 @@ static void rn_clk_mgr_helper_populate_b
    /* Find lowest DPM, FCLK is filled in reverse order*/

    for (i = PP_SMU_NUM_FCLK_DPM_LEVELS - 1; i >= 0; i--) {
    - if (clock_table->FClocks[i].Freq != 0) {
    + if (clock_table->FClocks[i].Freq != 0 && clock_table->FClocks[i].Vol != 0) {
    j = i;
    break;
    }

    \
     
     \ /
      Last update: 2020-04-16 16:03    [W:4.334 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site