diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4273-drm-amdgpu-define-macros-for-retire-page-reservation.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4273-drm-amdgpu-define-macros-for-retire-page-reservation.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4273-drm-amdgpu-define-macros-for-retire-page-reservation.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4273-drm-amdgpu-define-macros-for-retire-page-reservation.patch new file mode 100644 index 00000000..13606bac --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4273-drm-amdgpu-define-macros-for-retire-page-reservation.patch @@ -0,0 +1,69 @@ +From 1634c0392f40aaa2207a17188be18362f9e07e3b Mon Sep 17 00:00:00 2001 +From: Guchun Chen <guchun.chen@amd.com> +Date: Tue, 22 Oct 2019 11:39:25 +0800 +Subject: [PATCH 4273/4736] drm/amdgpu: define macros for retire page + reservation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Easy for maintainance. + +Signed-off-by: Guchun Chen <guchun.chen@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +index 5b532cd254cc..ebc3e15eca8b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +@@ -66,6 +66,11 @@ const char *ras_block_string[] = { + /* inject address is 52 bits */ + #define RAS_UMC_INJECT_ADDR_LIMIT (0x1ULL << 52) + ++enum amdgpu_ras_retire_page_reservation { ++ AMDGPU_RAS_RETIRE_PAGE_RESERVED, ++ AMDGPU_RAS_RETIRE_PAGE_PENDING, ++ AMDGPU_RAS_RETIRE_PAGE_FAULT, ++}; + + atomic_t amdgpu_ras_in_intr = ATOMIC_INIT(0); + +@@ -807,11 +812,11 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, + static char *amdgpu_ras_badpage_flags_str(unsigned int flags) + { + switch (flags) { +- case 0: ++ case AMDGPU_RAS_RETIRE_PAGE_RESERVED: + return "R"; +- case 1: ++ case AMDGPU_RAS_RETIRE_PAGE_PENDING: + return "P"; +- case 2: ++ case AMDGPU_RAS_RETIRE_PAGE_FAULT: + default: + return "F"; + }; +@@ -1292,13 +1297,13 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, + (*bps)[i] = (struct ras_badpage){ + .bp = data->bps[i].retired_page, + .size = AMDGPU_GPU_PAGE_SIZE, +- .flags = 0, ++ .flags = AMDGPU_RAS_RETIRE_PAGE_RESERVED, + }; + + if (data->last_reserved <= i) +- (*bps)[i].flags = 1; ++ (*bps)[i].flags = AMDGPU_RAS_RETIRE_PAGE_PENDING; + else if (data->bps_bo[i] == NULL) +- (*bps)[i].flags = 2; ++ (*bps)[i].flags = AMDGPU_RAS_RETIRE_PAGE_FAULT; + } + + *count = data->count; +-- +2.17.1 + |