On Sun, Nov 26, 2017 at 10:53 PM, Liu, Monk <Monk.Liu at amd.com> wrote: > Anyone review this one ? Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf Of Monk Liu > Sent: 2017å¹´11æ??24æ?¥ 15:07 > To: amd-gfx at lists.freedesktop.org > Cc: Liu, Monk <Monk.Liu at amd.com> > Subject: [PATCH] Revert "drm/amdgpu: fix rmmod KCQ disable failed error" > > This reverts commit ff8a0428d1b0e55db6b6e0462e2dc51c4d6724a8. > > this patch is incorrrect, amdgpu_ucode_bo_fini always called after gfx_hw_fini > > Change-Id: I7246ea0d2c7c843c14e9923c4d2efde4d90a9ef5 > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 --- > drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 +++ > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 285daa8..48e892e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1914,9 +1914,6 @@ static int amdgpu_fini(struct amdgpu_device *adev) > adev->ip_blocks[i].status.hw = false; > } > > - if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) > - amdgpu_ucode_fini_bo(adev); > - > for (i = adev->num_ip_blocks - 1; i >= 0; i--) { > if (!adev->ip_blocks[i].status.sw) > continue; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > index 033fba2..5f5aa5f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c > @@ -164,6 +164,9 @@ static int amdgpu_pp_hw_fini(void *handle) > ret = adev->powerplay.ip_funcs->hw_fini( > adev->powerplay.pp_handle); > > + if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU) > + amdgpu_ucode_fini_bo(adev); > + > return ret; > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index f95a200..2157d45 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -446,6 +446,8 @@ static int psp_hw_fini(void *handle) > if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) > return 0; > > + amdgpu_ucode_fini_bo(adev); > + > psp_ring_destroy(psp, PSP_RING_TYPE__KM); > > amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf); > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
