diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2017-09-01 01:46:20 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-12 14:21:50 -0400 |
commit | df1e63942063a0638a5813e5904988d834db2665 (patch) | |
tree | d5b86866716bb5b9eb9be0da8bb53616e3a47d43 /drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |
parent | cd00a424d26f9b954f5a084b88800e859fc0c52f (diff) |
drm/amd/powerplay: delete eventmgr layer in poweprlay
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 7df503aedb69..10c5d78081ed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | |||
@@ -119,7 +119,7 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev, | |||
119 | } | 119 | } |
120 | 120 | ||
121 | if (adev->pp_enabled) { | 121 | if (adev->pp_enabled) { |
122 | amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL); | 122 | amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_ENABLE_USER_STATE, &state, NULL); |
123 | } else { | 123 | } else { |
124 | mutex_lock(&adev->pm.mutex); | 124 | mutex_lock(&adev->pm.mutex); |
125 | adev->pm.dpm.user_state = state; | 125 | adev->pm.dpm.user_state = state; |
@@ -330,7 +330,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev, | |||
330 | if (state != POWER_STATE_TYPE_INTERNAL_BOOT && | 330 | if (state != POWER_STATE_TYPE_INTERNAL_BOOT && |
331 | state != POWER_STATE_TYPE_DEFAULT) { | 331 | state != POWER_STATE_TYPE_DEFAULT) { |
332 | amdgpu_dpm_dispatch_task(adev, | 332 | amdgpu_dpm_dispatch_task(adev, |
333 | AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL); | 333 | AMD_PP_TASK_ENABLE_USER_STATE, &state, NULL); |
334 | adev->pp_force_state_enabled = true; | 334 | adev->pp_force_state_enabled = true; |
335 | } | 335 | } |
336 | } | 336 | } |
@@ -559,7 +559,7 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, | |||
559 | 559 | ||
560 | if (adev->pp_enabled) { | 560 | if (adev->pp_enabled) { |
561 | amdgpu_dpm_set_sclk_od(adev, (uint32_t)value); | 561 | amdgpu_dpm_set_sclk_od(adev, (uint32_t)value); |
562 | amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_READJUST_POWER_STATE, NULL, NULL); | 562 | amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_READJUST_POWER_STATE, NULL, NULL); |
563 | } else if (adev->pm.funcs->set_sclk_od) { | 563 | } else if (adev->pm.funcs->set_sclk_od) { |
564 | adev->pm.funcs->set_sclk_od(adev, (uint32_t)value); | 564 | adev->pm.funcs->set_sclk_od(adev, (uint32_t)value); |
565 | adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; | 565 | adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; |
@@ -605,7 +605,7 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev, | |||
605 | 605 | ||
606 | if (adev->pp_enabled) { | 606 | if (adev->pp_enabled) { |
607 | amdgpu_dpm_set_mclk_od(adev, (uint32_t)value); | 607 | amdgpu_dpm_set_mclk_od(adev, (uint32_t)value); |
608 | amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_READJUST_POWER_STATE, NULL, NULL); | 608 | amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_READJUST_POWER_STATE, NULL, NULL); |
609 | } else if (adev->pm.funcs->set_mclk_od) { | 609 | } else if (adev->pm.funcs->set_mclk_od) { |
610 | adev->pm.funcs->set_mclk_od(adev, (uint32_t)value); | 610 | adev->pm.funcs->set_mclk_od(adev, (uint32_t)value); |
611 | adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; | 611 | adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; |
@@ -1496,7 +1496,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) | |||
1496 | } | 1496 | } |
1497 | 1497 | ||
1498 | if (adev->pp_enabled) { | 1498 | if (adev->pp_enabled) { |
1499 | amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_DISPLAY_CONFIG_CHANGE, NULL, NULL); | 1499 | amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE, NULL, NULL); |
1500 | } else { | 1500 | } else { |
1501 | mutex_lock(&adev->pm.mutex); | 1501 | mutex_lock(&adev->pm.mutex); |
1502 | adev->pm.dpm.new_active_crtcs = 0; | 1502 | adev->pm.dpm.new_active_crtcs = 0; |