1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
From 7f2bd223ae558e053e415dfa8d08d4c00b4c1e1a Mon Sep 17 00:00:00 2001
From: Rex Zhu <Rex.Zhu@amd.com>
Date: Tue, 29 Dec 2015 13:56:03 +0800
Subject: [PATCH 1016/1050] drm/amd/powerplay: add powerplay valid check to
avoid null point.
In case CONFIG_DRM_AMD_POWERPLAY is defined and amdgpu.powerplay=0.
some functions in powrplay can also be called by DAL. and the input parameter is *adev.
if just check point not NULL was not enough and will lead to NULL point error.
Change-Id: I76ff4ce6a31ba61ca84b0b60218b134a193f94a6
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 27 +++++++++++++++++++------
drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 3 +++
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 6e83a79..2dbc324 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -31,6 +31,12 @@
#include "eventmanager.h"
#include "pp_debug.h"
+#define PP_CHECK(handle) \
+ do { \
+ if ((handle) == NULL || (handle)->pp_valid != PP_VALID) \
+ return -EINVAL; \
+ } while (0)
+
static int pp_early_init(void *handle)
{
return 0;
@@ -538,6 +544,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init,
if (handle == NULL)
return -ENOMEM;
+ handle->pp_valid = PP_VALID;
+
ret = smum_init(pp_init, handle);
if (ret)
goto fail_smum;
@@ -612,8 +620,7 @@ int amd_powerplay_display_configuration_change(void *handle,
{
struct pp_hwmgr *hwmgr;
- if (handle == NULL)
- return -EINVAL;
+ PP_CHECK((struct pp_instance *)handle);
hwmgr = ((struct pp_instance *)handle)->hwmgr;
@@ -626,7 +633,9 @@ int amd_powerplay_get_display_power_level(void *handle,
{
struct pp_hwmgr *hwmgr;
- if (handle == NULL || output == NULL)
+ PP_CHECK((struct pp_instance *)handle);
+
+ if (output == NULL)
return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr;
@@ -641,7 +650,9 @@ int amd_powerplay_get_current_clocks(void *handle,
struct amd_pp_simple_clock_info simple_clocks;
struct pp_clock_info hw_clocks;
- if (handle == NULL || clocks == NULL)
+ PP_CHECK((struct pp_instance *)handle);
+
+ if (clocks == NULL)
return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr;
@@ -683,7 +694,9 @@ int amd_powerplay_get_clock_by_type(void *handle, enum amd_pp_clock_type type, s
struct pp_hwmgr *hwmgr;
- if (handle == NULL || clocks == NULL)
+ PP_CHECK((struct pp_instance *)handle);
+
+ if (clocks == NULL)
return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr;
@@ -699,7 +712,9 @@ int amd_powerplay_get_display_mode_validation_clocks(void *handle,
int result = -1;
struct pp_hwmgr *hwmgr;
- if (handle == NULL || clocks == NULL)
+ PP_CHECK((struct pp_instance *)handle);
+
+ if (clocks == NULL)
return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr;
diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h b/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
index 7b60b61..4d8ed1f 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
@@ -27,7 +27,10 @@
#include "hwmgr.h"
#include "eventmgr.h"
+#define PP_VALID 0x1F1F1F1F
+
struct pp_instance {
+ uint32_t pp_valid;
struct pp_smumgr *smu_mgr;
struct pp_hwmgr *hwmgr;
struct pp_eventmgr *eventmgr;
--
1.9.1
|
