diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4700-drm-amdgpu-Update-pin_size-values-before-unpinning-B.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4700-drm-amdgpu-Update-pin_size-values-before-unpinning-B.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4700-drm-amdgpu-Update-pin_size-values-before-unpinning-B.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4700-drm-amdgpu-Update-pin_size-values-before-unpinning-B.patch new file mode 100644 index 00000000..6b77b22d --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4700-drm-amdgpu-Update-pin_size-values-before-unpinning-B.patch @@ -0,0 +1,59 @@ +From 00c69132d943be3650e1038c4ed9a3b9b9171075 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> +Date: Fri, 15 Jun 2018 11:06:56 +0200 +Subject: [PATCH 4700/5725] drm/amdgpu: Update pin_size values before unpinning + BO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +At least in theory, ttm_bo_validate may move the BO, in which case the +pin_size accounting would be inconsistent with when the BO was pinned. + +Cc: stable@vger.kernel.org +Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +index f218f1c..4864d9c 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +@@ -994,15 +994,6 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) + bo->pin_count--; + if (bo->pin_count) + return 0; +- for (i = 0; i < bo->placement.num_placement; i++) { +- bo->placements[i].lpfn = 0; +- bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; +- } +- r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx); +- if (unlikely(r)) { +- dev_err(adev->dev, "%p validate failed for unpin\n", bo); +- goto error; +- } + + if (bo->tbo.mem.mem_type == TTM_PL_VRAM) { + adev->vram_pin_size -= amdgpu_bo_size(bo); +@@ -1012,7 +1003,14 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) + adev->gart_pin_size -= amdgpu_bo_size(bo); + } + +-error: ++ for (i = 0; i < bo->placement.num_placement; i++) { ++ bo->placements[i].lpfn = 0; ++ bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT; ++ } ++ r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx); ++ if (unlikely(r)) ++ dev_err(adev->dev, "%p validate failed for unpin\n", bo); ++ + return r; + } + +-- +2.7.4 + |