diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index fd1dc3236eca..d7e17e34fee1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -183,18 +183,18 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)  	/* Call ACPI methods: require modeset init  	 * but failure is not fatal  	 */ -	if (!r) { -		acpi_status = amdgpu_acpi_init(adev); -		if (acpi_status) -			dev_dbg(&dev->pdev->dev, -				"Error during ACPI methods call\n"); -	} + +	acpi_status = amdgpu_acpi_init(adev); +	if (acpi_status) +		dev_dbg(&dev->pdev->dev, "Error during ACPI methods call\n");  	if (adev->runpm) { -		dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NEVER_SKIP); +		/* only need to skip on ATPX */ +		if (amdgpu_device_supports_boco(dev) && +		    !amdgpu_is_atpx_hybrid()) +			dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE);  		pm_runtime_use_autosuspend(dev->dev);  		pm_runtime_set_autosuspend_delay(dev->dev, 5000); -		pm_runtime_set_active(dev->dev);  		pm_runtime_allow(dev->dev);  		pm_runtime_mark_last_busy(dev->dev);  		pm_runtime_put_autosuspend(dev->dev); |