diff options
author | Dave Airlie <airlied@redhat.com> | 2019-03-03 21:02:55 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-03-03 21:02:55 -0500 |
commit | 2c3cd66f4c66b169c18a2dbebbc894681d282278 (patch) | |
tree | 9d2e055ea43e177914a4cce9d007982a7417623c /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
parent | 7fbd5d784f75750199c21918da9b2fc92af371e6 (diff) | |
parent | 1c163f4c7b3f621efff9b28a47abb36f7378d783 (diff) |
Merge v5.0 into drm-next
There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.
Also some misc fixes are landed by me, but the pr has them as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index b65e18101108..e860412043bb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |||
@@ -212,6 +212,7 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) | |||
212 | } | 212 | } |
213 | 213 | ||
214 | if (amdgpu_device_is_px(dev)) { | 214 | if (amdgpu_device_is_px(dev)) { |
215 | dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NEVER_SKIP); | ||
215 | pm_runtime_use_autosuspend(dev->dev); | 216 | pm_runtime_use_autosuspend(dev->dev); |
216 | pm_runtime_set_autosuspend_delay(dev->dev, 5000); | 217 | pm_runtime_set_autosuspend_delay(dev->dev, 5000); |
217 | pm_runtime_set_active(dev->dev); | 218 | pm_runtime_set_active(dev->dev); |