diff options
| author |   Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
| commit | d53e181c85effdfdec97a760622330626c922d81 (patch) | |
| tree | 9df58cc9a8dd4c752cdc6f11604787a48a8e1238 /drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | |
| parent | IB/core: Fix oops in ib_cache_gid_set_default_gid (diff) | |
| parent | Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
| download | linux-dev-d53e181c85effdfdec97a760622330626c922d81.tar.xz linux-dev-d53e181c85effdfdec97a760622330626c922d81.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into testing/4.6
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c index d6b0bff510aa..b7b583c42ea8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c @@ -425,6 +425,10 @@ static int acp_resume(void *handle) struct acp_pm_domain *apd; struct amdgpu_device *adev = (struct amdgpu_device *)handle; + /* return early if no ACP */ + if (!adev->acp.acp_genpd) + return 0; + /* SMU block will power on ACP irrespective of ACP runtime status. * Power off explicitly based on genpd ACP runtime status so that ACP * hw and ACP-genpd status are in sync. |