Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next

First feature request for 4.19.  Highlights:
- Add initial amdgpu documentation
- Add initial GPU scheduler documention
- GPU scheduler fixes for dying processes
- Add support for the JPEG engine on VCN
- Switch CI to use powerplay by default
- EDC support for CZ
- More powerplay cleanups
- Misc DC fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20180621161138.3008-1-alexander.deucher@amd.com

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 5c97a3671726..d51318c695e6 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -3480,7 +3480,7 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
                 disable_sclk_switching = true;
         }
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
@@ -3489,7 +3489,7 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
                 if (ps->performance_levels[i].vddc > ps->performance_levels[i+1].vddc)
                         ps->performance_levels[i].vddc = ps->performance_levels[i+1].vddc;
         }
-        if (adev->pm.dpm.ac_power == false) {
+        if (adev->pm.ac_power == false) {
                 for (i = 0; i < ps->performance_level_count; i++) {
                         if (ps->performance_levels[i].mclk > max_limits->mclk)
                                 ps->performance_levels[i].mclk = max_limits->mclk;