Commit cd6fc55f authored by Yunxiang Li's avatar Yunxiang Li Committed by Wen Zhiwei
Browse files

drm/amdgpu: add lock in amdgpu_gart_invalidate_tlb 

stable inclusion
from stable-v6.6.50
commit ddfe95f2e1fcefeb9ab70476753e1fd0a083f59b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYKL6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ddfe95f2e1fcefeb9ab70476753e1fd0a083f59b



--------------------------------

[ Upstream commit 18f2525d31401e5142db95ff3a6ec0f4147be818 ]

We need to take the reset domain lock before flush hdp. We can't put the
lock inside amdgpu_device_flush_hdp itself because it is used during
reset where we already take the write side lock.

Signed-off-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 0e4fa661

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/set_memory.h>

#endif

#include "amdgpu.h"

#include "amdgpu_reset.h"

#include <drm/drm_drv.h>

#include <drm/ttm/ttm_tt.h>
@@ -400,7 +401,10 @@ void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev) 
		return;



	mb();

	if (down_read_trylock(&adev->reset_domain->sem)) {

		amdgpu_device_flush_hdp(adev, NULL);

		up_read(&adev->reset_domain->sem);

	}

	for_each_set_bit(i, adev->vmhubs_mask, AMDGPU_MAX_VMHUBS)

		amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);

}