xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: add powerplay valid check to avoid null point. (v2)

Browse Source 
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.

V2: AGD: rebase on upstream

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rex Zhu
2015-12-29 13:56:03 +08:00
committed by Alex Deucher
parent c15c8d7020
commit a969e163a4
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/amd/powerplay/amd_powerplay.c
View File

@@ -30,6 +30,12 @@
#include "power_state.h" #include "power_state.h"
#include "eventmanager.h" #include "eventmanager.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) static int pp_early_init(void *handle)
{ {
return 0; return 0;
@@ -537,6 +543,8 @@ static int amd_pp_instance_init(struct amd_pp_init *pp_init,
if (handle == NULL) if (handle == NULL)
return -ENOMEM; return -ENOMEM;
handle->pp_valid = PP_VALID;
ret = smum_init(pp_init, handle); ret = smum_init(pp_init, handle);
if (ret) if (ret)
goto fail_smum; goto fail_smum;
@@ -611,8 +619,7 @@ int amd_powerplay_display_configuration_change(void *handle, const void *input)
struct pp_hwmgr *hwmgr; struct pp_hwmgr *hwmgr;
const struct amd_pp_display_configuration *display_config = input; const struct amd_pp_display_configuration *display_config = input;
if (handle == NULL) PP_CHECK((struct pp_instance *)handle);
return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr; hwmgr = ((struct pp_instance *)handle)->hwmgr;
@@ -625,7 +632,9 @@ int amd_powerplay_get_display_power_level(void *handle,
{ {
struct pp_hwmgr *hwmgr; struct pp_hwmgr *hwmgr;
if (handle == NULL || output == NULL) PP_CHECK((struct pp_instance *)handle);
if (output == NULL)
return -EINVAL; return -EINVAL;
hwmgr = ((struct pp_instance *)handle)->hwmgr; hwmgr = ((struct pp_instance *)handle)->hwmgr;

3
drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
View File

@@ -27,7 +27,10 @@
#include "hwmgr.h" #include "hwmgr.h"
#include "eventmgr.h" #include "eventmgr.h"
#define PP_VALID 0x1F1F1F1F
struct pp_instance { struct pp_instance {
uint32_t pp_valid;
struct pp_smumgr *smu_mgr; struct pp_smumgr *smu_mgr;
struct pp_hwmgr *hwmgr; struct pp_hwmgr *hwmgr;
struct pp_eventmgr *eventmgr; struct pp_eventmgr *eventmgr;