dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexdeucher@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 3/6] drm/amdgpu: drop explicit pci D3/D0 setting for ATPX power control
Date: Thu,  2 Jun 2016 09:33:34 -0400	[thread overview]
Message-ID: <1464874417-27272-3-git-send-email-alexander.deucher@amd.com> (raw)
In-Reply-To: <1464874417-27272-1-git-send-email-alexander.deucher@amd.com>

The ATPX power control method does this for you.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 6c38901..e2bf4ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -419,9 +419,7 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev)
 	pci_ignore_hotplug(pdev);
 	if (amdgpu_is_atpx_hybrid())
 		pci_set_power_state(pdev, PCI_D3cold);
-	else if (amdgpu_has_atpx_dgpu_power_cntl())
-		pci_set_power_state(pdev, PCI_D3cold);
-	else
+	else if (!amdgpu_has_atpx_dgpu_power_cntl())
 		pci_set_power_state(pdev, PCI_D3hot);
 	drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
 
@@ -439,7 +437,9 @@ static int amdgpu_pmops_runtime_resume(struct device *dev)
 
 	drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
 
-	pci_set_power_state(pdev, PCI_D0);
+	if (amdgpu_is_atpx_hybrid() ||
+	    !amdgpu_has_atpx_dgpu_power_cntl())
+		pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
 	ret = pci_enable_device(pdev);
 	if (ret)
-- 
2.5.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2016-06-02 13:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-02 13:33 [PATCH 1/6] drm/amdgpu/atpx: track whether if this is a hybrid graphics platform Alex Deucher
2016-06-02 13:33 ` [PATCH 2/6] drm/amdgpu/atpx: hybrid platforms use d3cold Alex Deucher
2016-06-02 13:33 ` Alex Deucher [this message]
2016-06-02 19:23   ` [PATCH 3/6] drm/amdgpu: drop explicit pci D3/D0 setting for ATPX power control Lukas Wunner
2016-06-02 19:26     ` Alex Deucher
2016-06-02 19:49       ` Lukas Wunner
2016-06-02 13:33 ` [PATCH 4/6] drm/radeon/atpx: track whether if this is a hybrid graphics platform Alex Deucher
2016-06-02 13:33 ` [PATCH 5/6] drm/radeon/atpx: hybrid platforms use d3cold Alex Deucher
2016-06-02 13:33 ` [PATCH 6/6] drm/radeon: drop explicit pci D3/D0 setting for ATPX power control Alex Deucher
2016-06-02 14:20 ` [PATCH 1/6] drm/amdgpu/atpx: track whether if this is a hybrid graphics platform Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464874417-27272-3-git-send-email-alexander.deucher@amd.com \
    --to=alexdeucher@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox