lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 060/177] drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate
    Date
    From: Evan Quan <evan.quan@amd.com>

    [ Upstream commit 1fe48ec08d9f2e26d893a6c05bd6c99a3490f9ef ]

    As this is already properly handled in amdgpu_gfx_off_ctrl(). In fact,
    this unnecessary cancel_delayed_work_sync may leave a small time window
    for race condition and is dangerous.

    Signed-off-by: Evan Quan <evan.quan@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +-----
    drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +++---------
    2 files changed, 4 insertions(+), 14 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    index 02702597ddeb..012df3d574bf 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    @@ -4241,11 +4241,7 @@ static int gfx_v10_0_set_powergating_state(void *handle,
    switch (adev->asic_type) {
    case CHIP_NAVI10:
    case CHIP_NAVI14:
    - if (!enable) {
    - amdgpu_gfx_off_ctrl(adev, false);
    - cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
    - } else
    - amdgpu_gfx_off_ctrl(adev, true);
    + amdgpu_gfx_off_ctrl(adev, enable);
    break;
    default:
    break;
    diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
    index 906648fca9ef..914dbd901b98 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
    @@ -4734,10 +4734,9 @@ static int gfx_v9_0_set_powergating_state(void *handle,
    switch (adev->asic_type) {
    case CHIP_RAVEN:
    case CHIP_RENOIR:
    - if (!enable) {
    + if (!enable)
    amdgpu_gfx_off_ctrl(adev, false);
    - cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
    - }
    +
    if (adev->pg_flags & AMD_PG_SUPPORT_RLC_SMU_HS) {
    gfx_v9_0_enable_sck_slow_down_on_power_up(adev, true);
    gfx_v9_0_enable_sck_slow_down_on_power_down(adev, true);
    @@ -4761,12 +4760,7 @@ static int gfx_v9_0_set_powergating_state(void *handle,
    amdgpu_gfx_off_ctrl(adev, true);
    break;
    case CHIP_VEGA12:
    - if (!enable) {
    - amdgpu_gfx_off_ctrl(adev, false);
    - cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
    - } else {
    - amdgpu_gfx_off_ctrl(adev, true);
    - }
    + amdgpu_gfx_off_ctrl(adev, enable);
    break;
    default:
    break;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 20:13    [W:4.063 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site