drm/amdgpu: fix calltrace during kmd unload(v2)
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix calltrace during kmd unload(v2)
kernel would report a warning on double unpin on the csb BO because we unpin it during hw_fini but actually we don't need to pin/unpin it during hw_init/fini since it is created with kernel pinned
v2:get_csb in init_rlc so hw_init() will make CSIB content back even after reset or s3.
take care of gfx7/8 as well
remove all those useless code for gfx9/10
Signed-off-by Monk Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 8 ----- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 58 +-------------------------------- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +---------------------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 40 +---------------------- 5 files changed, 5 insertions(+), 143 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c +0 -8
@@ -124,7 +124,6 @@ int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws)*/ int amdgpu_gfx_rlc_init_csb (struct amdgpu_device *adev) { -volatile u32 *dst_ptr;u32 dws;int r;
@@ -141,13 +140,6 @@ int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev)return r; } -/* set up the cs buffer */ - dst_ptr = adev->gfx.rlc.cs_ptr; - adev->gfx.rlc.funcs->get_csb_buffer (adev, dst_ptr); -amdgpu_bo_kunmap (adev->gfx.rlc.clear_state_obj); -amdgpu_bo_unpin (adev->gfx.rlc.clear_state_obj); -amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); -return 0 ; }
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -57
82 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +2 -0
@@ -4554,6 +4554,8 @@ static int gfx_v7_0_hw_init(void *handle)gfx_v7_0_constants_init (adev); +/* init CSB */ + adev->gfx.rlc.funcs->get_csb_buffer (adev, adev->gfx.rlc.cs_ptr);/* init rlc */ r = adev->gfx.rlc.funcs->resume (adev);if (r)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +1 -39
@@ -1321,39 +1321,6 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev)return 0 ; } -static int gfx_v8_0_csb_vram_pin (struct amdgpu_device *adev) -{ -int r; - - r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, false); -if (unlikely (r !=0 )) -return r; - - r =amdgpu_bo_pin (adev->gfx.rlc.clear_state_obj, -AMDGPU_GEM_DOMAIN_VRAM ); -if (!r) - adev->gfx.rlc.clear_state_gpu_addr = -amdgpu_bo_gpu_offset (adev->gfx.rlc.clear_state_obj); - -amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); - -return r; -} - -static void gfx_v8_0_csb_vram_unpin (struct amdgpu_device *adev) -{ -int r; - -if (!adev->gfx.rlc.clear_state_obj) -return ; - - r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, true); -if (likely (r ==0 )) { -amdgpu_bo_unpin (adev->gfx.rlc.clear_state_obj); -amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); - } -} -static void gfx_v8_0_mec_fini (struct amdgpu_device *adev) {amdgpu_bo_free_kernel (&adev->gfx.mec.hpd_eop_obj,NULL ,NULL );
@@ -3916,6 +3883,7 @@ static void gfx_v8_0_enable_gui_idle_interrupt(struct amdgpu_device *adev,static void gfx_v8_0_init_csb (struct amdgpu_device *adev) { + adev->gfx.rlc.funcs->get_csb_buffer (adev, adev->gfx.rlc.cs_ptr);/* csib */ WREG32 (mmRLC_CSIB_ADDR_HI, adev->gfx.rlc.clear_state_gpu_addr >>32 );
@@ -4836,10 +4804,6 @@ static int gfx_v8_0_hw_init(void *handle)gfx_v8_0_init_golden_registers (adev);gfx_v8_0_constants_init (adev); - r =gfx_v8_0_csb_vram_pin (adev); -if (r) -return r; - r = adev->gfx.rlc.funcs->resume (adev);if (r)return r;
@@ -4957,8 +4921,6 @@ static int gfx_v8_0_hw_fini(void *handle)pr_err ("rlc is busy, skip halt rlc\n" );amdgpu_gfx_rlc_exit_safe_mode (adev); -gfx_v8_0_csb_vram_unpin (adev); -return 0 ; }
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -39
@@ -1685,39 +1685,6 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device *adev)return 0 ; } -static int gfx_v9_0_csb_vram_pin (struct amdgpu_device *adev) -{ -int r; - - r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, false); -if (unlikely (r !=0 )) -return r; - - r =amdgpu_bo_pin (adev->gfx.rlc.clear_state_obj, -AMDGPU_GEM_DOMAIN_VRAM ); -if (!r) - adev->gfx.rlc.clear_state_gpu_addr = -amdgpu_bo_gpu_offset (adev->gfx.rlc.clear_state_obj); - -amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); - -return r; -} - -static void gfx_v9_0_csb_vram_unpin (struct amdgpu_device *adev) -{ -int r; - -if (!adev->gfx.rlc.clear_state_obj) -return ; - - r =amdgpu_bo_reserve (adev->gfx.rlc.clear_state_obj, true); -if (likely (r ==0 )) { -amdgpu_bo_unpin (adev->gfx.rlc.clear_state_obj); -amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); - } -} -static void gfx_v9_0_mec_fini (struct amdgpu_device *adev) {amdgpu_bo_free_kernel (&adev->gfx.mec.hpd_eop_obj,NULL ,NULL );
@@ -2405,6 +2372,7 @@ static void gfx_v9_0_enable_gui_idle_interrupt(struct amdgpu_device *adev,static void gfx_v9_0_init_csb (struct amdgpu_device *adev) { + adev->gfx.rlc.funcs->get_csb_buffer (adev, adev->gfx.rlc.cs_ptr);/* csib */ WREG32_RLC (SOC15_REG_OFFSET (GC ,0 , mmRLC_CSIB_ADDR_HI), adev->gfx.rlc.clear_state_gpu_addr >>32 );
@@ -3696,10 +3664,6 @@ static int gfx_v9_0_hw_init(void *handle)gfx_v9_0_constants_init (adev); - r =gfx_v9_0_csb_vram_pin (adev); -if (r) -return r; - r = adev->gfx.rlc.funcs->resume (adev);if (r)return r;
@@ -3781,8 +3745,6 @@ static int gfx_v9_0_hw_fini(void *handle)gfx_v9_0_cp_enable (adev, false); adev->gfx.rlc.funcs->stop (adev); -gfx_v9_0_csb_vram_unpin (adev); -return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx