drm/amd/pm: move pp_force_state_enabled member to amdgpu_pm structure

As it lables an internal pm state and amdgpu_pm structure is the more
proper place than amdgpu_device structure for it.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 182d673103ed38080f2fed5b7abd0e1eb2f1c888..d6dff14e7a2df2623441c9ca1f5140d15a79a092 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -949,7 +949,6 @@ struct amdgpu_device {
 
        /* powerplay */
        struct amd_powerplay            powerplay;
-       bool                            pp_force_state_enabled;
 
        /* smu */
        struct smu_context              smu;

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index b16bb67b93f187e1d3039b9bf951bc988f9b1948..cd32f4ed373ebcb4e2a8bab945710444da7c7d2c 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -469,7 +469,7 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev,
        if (adev->in_suspend && !adev->in_runpm)
                return -EPERM;
 
-       if (adev->pp_force_state_enabled)
+       if (adev->pm.pp_force_state_enabled)
                return amdgpu_get_pp_cur_state(dev, attr, buf);
        else
                return sysfs_emit(buf, "\n");
@@ -492,7 +492,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
        if (adev->in_suspend && !adev->in_runpm)
                return -EPERM;
 
-       adev->pp_force_state_enabled = false;
+       adev->pm.pp_force_state_enabled = false;
 
        if (strlen(buf) == 1)
                return count;
@@ -523,7 +523,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
                if (ret)
                        goto err_out;
 
-               adev->pp_force_state_enabled = true;
+               adev->pm.pp_force_state_enabled = true;
        }
 
        pm_runtime_mark_last_busy(ddev->dev);

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
index 1958e0e488b0f38c6bae066bc9e0b46026d96491..7afff23305a54b82038fc39efda54d0c49d29762 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
@@ -343,6 +343,8 @@ struct amdgpu_pm {
         * 0 = disabled (default), otherwise enable corresponding debug mode
         */
        uint32_t                smu_debug_mask;
+
+       bool                    pp_force_state_enabled;
 };
 
 #define R600_SSTU_DFLT                               0