diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3622-drm-amdgpu-introduce-vram-lost-for-reset-v2.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3622-drm-amdgpu-introduce-vram-lost-for-reset-v2.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3622-drm-amdgpu-introduce-vram-lost-for-reset-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3622-drm-amdgpu-introduce-vram-lost-for-reset-v2.patch new file mode 100644 index 00000000..15577564 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3622-drm-amdgpu-introduce-vram-lost-for-reset-v2.patch @@ -0,0 +1,95 @@ +From 20dd1c66e248fb981c8329ea14d93aa069a15541 Mon Sep 17 00:00:00 2001 +From: Monk Liu <Monk.Liu@amd.com> +Date: Tue, 27 Aug 2019 16:32:55 +0800 +Subject: [PATCH 3622/4256] drm/amdgpu: introduce vram lost for reset (v2) + +for SOC15/vega10 the BACO reset & mode1 would introduce vram lost +in high end address range, current kmd's vram lost checking cannot +catch it since it only check very ahead visible frame buffer + +v2: +cover NV as well + +Signed-off-by: Monk Liu <Monk.Liu@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/nv.c | 7 +++++-- + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++ + 4 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 0d68005ceef7..02bd4e99906f 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1192,6 +1192,7 @@ int emu_soc_asic_init(struct amdgpu_device *adev); + #define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1))) + #define amdgpu_asic_need_reset_on_init(adev) (adev)->asic_funcs->need_reset_on_init((adev)) + #define amdgpu_asic_get_pcie_replay_count(adev) ((adev)->asic_funcs->get_pcie_replay_count((adev))) ++#define amdgpu_inc_vram_lost(adev) atomic_inc(&((adev)->vram_lost_counter)); + + /* Common functions */ + bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index ba49073131d0..ed01af203896 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -3468,7 +3468,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, + amdgpu_virt_init_data_exchange(adev); + amdgpu_virt_release_full_gpu(adev, true); + if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) { +- atomic_inc(&adev->vram_lost_counter); ++ amdgpu_inc_vram_lost(adev); + r = amdgpu_device_recover_vram(adev); + } + +@@ -3634,7 +3634,7 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive, + vram_lost = amdgpu_device_check_vram_lost(tmp_adev); + if (vram_lost) { + DRM_INFO("VRAM is lost due to GPU reset!\n"); +- atomic_inc(&tmp_adev->vram_lost_counter); ++ amdgpu_inc_vram_lost(tmp_adev); + } + + r = amdgpu_gtt_mgr_recover( +diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c +index 384f8f512fc4..323af1ecfe9c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/nv.c ++++ b/drivers/gpu/drm/amd/amdgpu/nv.c +@@ -315,10 +315,13 @@ static int nv_asic_reset(struct amdgpu_device *adev) + int ret = 0; + struct smu_context *smu = &adev->smu; + +- if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ++ if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) { ++ amdgpu_inc_vram_lost(adev); + ret = smu_baco_reset(smu); +- else ++ } else { ++ amdgpu_inc_vram_lost(adev); + ret = nv_asic_mode1_reset(adev); ++ } + + return ret; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c +index fe2212df12a3..8af7501bded1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -557,10 +557,12 @@ static int soc15_asic_reset(struct amdgpu_device *adev) + { + switch (soc15_asic_reset_method(adev)) { + case AMD_RESET_METHOD_BACO: ++ amdgpu_inc_vram_lost(adev); + return soc15_asic_baco_reset(adev); + case AMD_RESET_METHOD_MODE2: + return soc15_mode2_reset(adev); + default: ++ amdgpu_inc_vram_lost(adev); + return soc15_asic_mode1_reset(adev); + } + } +-- +2.17.1 + |