diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-02 15:56:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-02 15:56:01 +1000 |
| commit | 542d972221e024681b502033154f917c1455469f (patch) | |
| tree | 1c7c1be768f6e1b496a3edad6b105804a8d05c57 /drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | |
| parent | 583fa4e02775b26d76771d4e1ddc6f10ba005ef2 (diff) | |
| parent | 4c2e07c6a29e0129e975727b9f57eede813eea85 (diff) | |
Back-merge tag 'v4.7-rc5' into drm-next
Linux 4.7-rc5
The fsl-dcu pull needs -rc3 so go to -rc5 for now.
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c index fa208ada6892..efb77eda7508 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c @@ -306,10 +306,14 @@ int phm_store_dal_configuration_data(struct pp_hwmgr *hwmgr, { PHM_FUNC_CHECK(hwmgr); - if (hwmgr->hwmgr_func->store_cc6_data == NULL) + if (display_config == NULL) return -EINVAL; hwmgr->display_config = *display_config; + + if (hwmgr->hwmgr_func->store_cc6_data == NULL) + return -EINVAL; + /* to do pass other display configuration in furture */ if (hwmgr->hwmgr_func->store_cc6_data) |