Skip to content
Snippets Groups Projects
  • Mukul Joshi's avatar
    4d14a740
    Revert "drm/amdgpu: Add missing locking for MES API calls" · 4d14a740
    Mukul Joshi authored
    
    This reverts commit 36127028.
    
    This is causing a BUG message during suspend.
    
    [   61.603542] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:283
    [   61.603550] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2028, name: kworker/u64:14
    [   61.603553] preempt_count: 1, expected: 0
    [   61.603555] RCU nest depth: 0, expected: 0
    [   61.603557] Preemption disabled at:
    [   61.603559] [<ffffffffc08a3261>] amdgpu_gfx_disable_kgq+0x61/0x160 [amdgpu]
    [   61.603789] CPU: 9 PID: 2028 Comm: kworker/u64:14 Tainted: G        W          6.8.0+ #7
    [   61.603795] Workqueue: events_unbound async_run_entry_fn
    [   61.603801] Call Trace:
    [   61.603803]  <TASK>
    [   61.603806]  dump_stack_lvl+0x37/0x50
    [   61.603811]  ? amdgpu_gfx_disable_kgq+0x61/0x160 [amdgpu]
    [   61.604007]  dump_stack+0x10/0x20
    [   61.604010]  __might_resched+0x16f/0x1d0
    [   61.604016]  __might_sleep+0x43/0x70
    [   61.604020]  mutex_lock+0x1f/0x60
    [   61.604024]  amdgpu_mes_unmap_legacy_queue+0x6d/0x100 [amdgpu]
    [   61.604226]  gfx11_kiq_unmap_queues+0x3dc/0x430 [amdgpu]
    [   61.604422]  ? srso_alias_return_thunk+0x5/0xfbef5
    [   61.604429]  amdgpu_gfx_disable_kgq+0x122/0x160 [amdgpu]
    [   61.604621]  gfx_v11_0_hw_fini+0xda/0x100 [amdgpu]
    [   61.604814]  gfx_v11_0_suspend+0xe/0x20 [amdgpu]
    [   61.605008]  amdgpu_device_ip_suspend_phase2+0x135/0x1d0 [amdgpu]
    [   61.605175]  amdgpu_device_suspend+0xec/0x180 [amdgpu]
    
    Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
    Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
    Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
    4d14a740
    History
    Revert "drm/amdgpu: Add missing locking for MES API calls"
    Mukul Joshi authored
    
    This reverts commit 36127028.
    
    This is causing a BUG message during suspend.
    
    [   61.603542] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:283
    [   61.603550] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2028, name: kworker/u64:14
    [   61.603553] preempt_count: 1, expected: 0
    [   61.603555] RCU nest depth: 0, expected: 0
    [   61.603557] Preemption disabled at:
    [   61.603559] [<ffffffffc08a3261>] amdgpu_gfx_disable_kgq+0x61/0x160 [amdgpu]
    [   61.603789] CPU: 9 PID: 2028 Comm: kworker/u64:14 Tainted: G        W          6.8.0+ #7
    [   61.603795] Workqueue: events_unbound async_run_entry_fn
    [   61.603801] Call Trace:
    [   61.603803]  <TASK>
    [   61.603806]  dump_stack_lvl+0x37/0x50
    [   61.603811]  ? amdgpu_gfx_disable_kgq+0x61/0x160 [amdgpu]
    [   61.604007]  dump_stack+0x10/0x20
    [   61.604010]  __might_resched+0x16f/0x1d0
    [   61.604016]  __might_sleep+0x43/0x70
    [   61.604020]  mutex_lock+0x1f/0x60
    [   61.604024]  amdgpu_mes_unmap_legacy_queue+0x6d/0x100 [amdgpu]
    [   61.604226]  gfx11_kiq_unmap_queues+0x3dc/0x430 [amdgpu]
    [   61.604422]  ? srso_alias_return_thunk+0x5/0xfbef5
    [   61.604429]  amdgpu_gfx_disable_kgq+0x122/0x160 [amdgpu]
    [   61.604621]  gfx_v11_0_hw_fini+0xda/0x100 [amdgpu]
    [   61.604814]  gfx_v11_0_suspend+0xe/0x20 [amdgpu]
    [   61.605008]  amdgpu_device_ip_suspend_phase2+0x135/0x1d0 [amdgpu]
    [   61.605175]  amdgpu_device_suspend+0xec/0x180 [amdgpu]
    
    Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
    Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
    Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>