]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: define macros for retire page reservation
authorGuchun Chen <guchun.chen@amd.com>
Tue, 22 Oct 2019 03:39:25 +0000 (11:39 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 25 Oct 2019 20:50:10 +0000 (16:50 -0400)
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index 2d9e13d2a71aa2a54594f017db5839355f36c176..796326b36e00d7bef550665efc5633613e214e1a 100644 (file)
@@ -68,6 +68,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);
 
@@ -809,11 +814,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";
        };
@@ -1294,13 +1299,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;