lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 146/542] drm/amd/powerplay: remove set but not used variable 'threshold', 'state'
    Date
    From: zhengbin <zhengbin13@huawei.com>

    [ Upstream commit f5ac1595156a8b63812ed6fa0803ddf7207cced7 ]

    Fixes gcc '-Wunused-but-set-variable' warning:

    drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c: In function fiji_populate_single_graphic_level:
    drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c:943:11: warning: variable threshold set but not used [-Wunused-but-set-variable]
    drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c: In function fiji_populate_memory_timing_parameters:
    drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c:1504:8: warning: variable state set but not used [-Wunused-but-set-variable]

    They are introduced by commit 2e112b4ae3ba ("drm/amd/pp:
    remove fiji_smc/smumgr split."), but never used,
    so remove it.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: zhengbin <zhengbin13@huawei.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
    index da025b1d302da..32ebb383c4568 100644
    --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
    +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
    @@ -940,7 +940,7 @@ static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
    {
    int result;
    /* PP_Clocks minClocks; */
    - uint32_t threshold, mvdd;
    + uint32_t mvdd;
    struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
    struct phm_ppt_v1_information *table_info =
    (struct phm_ppt_v1_information *)(hwmgr->pptable);
    @@ -973,8 +973,6 @@ static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
    level->VoltageDownHyst = 0;
    level->PowerThrottle = 0;

    - threshold = clock * data->fast_watermark_threshold / 100;
    -
    data->display_timing.min_clock_in_sr = hwmgr->display_config->min_core_set_clock_in_sr;

    if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SclkDeepSleep))
    @@ -1501,7 +1499,7 @@ static int fiji_populate_memory_timing_parameters(struct pp_hwmgr *hwmgr,
    uint32_t dram_timing;
    uint32_t dram_timing2;
    uint32_t burstTime;
    - ULONG state, trrds, trrdl;
    + ULONG trrds, trrdl;
    int result;

    result = atomctrl_set_engine_dram_timings_rv770(hwmgr,
    @@ -1513,7 +1511,6 @@ static int fiji_populate_memory_timing_parameters(struct pp_hwmgr *hwmgr,
    dram_timing2 = cgs_read_register(hwmgr->device, mmMC_ARB_DRAM_TIMING2);
    burstTime = cgs_read_register(hwmgr->device, mmMC_ARB_BURST_TIME);

    - state = PHM_GET_FIELD(burstTime, MC_ARB_BURST_TIME, STATE0);
    trrds = PHM_GET_FIELD(burstTime, MC_ARB_BURST_TIME, TRRDS0);
    trrdl = PHM_GET_FIELD(burstTime, MC_ARB_BURST_TIME, TRRDL0);

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:15    [W:2.305 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site