Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: get RAS poison status from DF v4_6_2
Add DF block and RAS poison mode query for DF v4_6_2.
Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Stanley.Yang <Stanley.Yang@amd.com>
Acked-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Tao Zhou
and committed by
Alex Deucher
2cea7bb9
dd2687f5
+71
-1
+2
-1
drivers/gpu/drm/amd/amdgpu/Makefile
+2
-1
drivers/gpu/drm/amd/amdgpu/Makefile
+4
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+4
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
···
35
35
#include "df_v1_7.h"
36
36
#include "df_v3_6.h"
37
37
#include "df_v4_3.h"
38
+
#include "df_v4_6_2.h"
38
39
#include "nbio_v6_1.h"
39
40
#include "nbio_v7_0.h"
40
41
#include "nbio_v7_4.h"
···
2559
2558
break;
2560
2559
case IP_VERSION(4, 3, 0):
2561
2560
adev->df.funcs = &df_v4_3_funcs;
2561
+
break;
2562
+
case IP_VERSION(4, 6, 2):
2563
+
adev->df.funcs = &df_v4_6_2_funcs;
2562
2564
break;
2563
2565
default:
2564
2566
break;
+34
drivers/gpu/drm/amd/amdgpu/df_v4_6_2.c
+34
drivers/gpu/drm/amd/amdgpu/df_v4_6_2.c
···
1
+
/*
2
+
* Copyright 2023 Advanced Micro Devices, Inc.
3
+
*
4
+
* Permission is hereby granted, free of charge, to any person obtaining a
5
+
* copy of this software and associated documentation files (the "Software"),
6
+
* to deal in the Software without restriction, including without limitation
7
+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8
+
* and/or sell copies of the Software, and to permit persons to whom the
9
+
* Software is furnished to do so, subject to the following conditions:
10
+
*
11
+
* The above copyright notice and this permission notice shall be included in
12
+
* all copies or substantial portions of the Software.
13
+
*
14
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17
+
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18
+
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19
+
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20
+
* OTHER DEALINGS IN THE SOFTWARE.
21
+
*
22
+
*/
23
+
#include "amdgpu.h"
24
+
#include "df_v4_6_2.h"
25
+
26
+
static bool df_v4_6_2_query_ras_poison_mode(struct amdgpu_device *adev)
27
+
{
28
+
/* return true since related regs are inaccessible */
29
+
return true;
30
+
}
31
+
32
+
const struct amdgpu_df_funcs df_v4_6_2_funcs = {
33
+
.query_ras_poison_mode = df_v4_6_2_query_ras_poison_mode,
34
+
};
+31
drivers/gpu/drm/amd/amdgpu/df_v4_6_2.h
+31
drivers/gpu/drm/amd/amdgpu/df_v4_6_2.h
···
1
+
/*
2
+
* Copyright 2023 Advanced Micro Devices, Inc.
3
+
*
4
+
* Permission is hereby granted, free of charge, to any person obtaining a
5
+
* copy of this software and associated documentation files (the "Software"),
6
+
* to deal in the Software without restriction, including without limitation
7
+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8
+
* and/or sell copies of the Software, and to permit persons to whom the
9
+
* Software is furnished to do so, subject to the following conditions:
10
+
*
11
+
* The above copyright notice and this permission notice shall be included in
12
+
* all copies or substantial portions of the Software.
13
+
*
14
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17
+
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18
+
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19
+
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20
+
* OTHER DEALINGS IN THE SOFTWARE.
21
+
*
22
+
*/
23
+
24
+
#ifndef __DF_V4_6_2_H__
25
+
#define __DF_V4_6_2_H__
26
+
27
+
#include "soc15_common.h"
28
+
29
+
extern const struct amdgpu_df_funcs df_v4_6_2_funcs;
30
+
31
+
#endif