Linux-ACPI Archive on lore.kernel.org
 help / color / Atom feed
From: Karol Herbst <kherbst@redhat.com>
To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
	dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org
Cc: Karol Herbst <kherbst@redhat.com>,
	Alex Hung <alex.hung@canonical.com>,
	"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
	Dave Airlie <airlied@redhat.com>, Lyude Paul <lyude@redhat.com>,
	Ben Skeggs <bskeggs@redhat.com>
Subject: [PATCH 7/7] drm/nouveau: abort runtime suspend if we hit an error
Date: Wed, 14 Aug 2019 23:31:18 +0200
Message-ID: <20190814213118.28473-8-kherbst@redhat.com> (raw)
In-Reply-To: <20190814213118.28473-1-kherbst@redhat.com>

Signed-off-by: Karol Herbst <kherbst@redhat.com>
CC: Alex Hung <alex.hung@canonical.com>
CC: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
CC: Dave Airlie <airlied@redhat.com>
CC: Lyude Paul <lyude@redhat.com>
CC: Ben Skeggs <bskeggs@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 16441c5bf29c..b16157a9c736 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -910,6 +910,7 @@ nouveau_pmops_runtime_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct drm_device *drm_dev = pci_get_drvdata(pdev);
+	struct nouveau_drm *drm = nouveau_drm(drm_dev);
 	int ret;
 
 	if (!nouveau_pmops_runtime()) {
@@ -919,6 +920,10 @@ nouveau_pmops_runtime_suspend(struct device *dev)
 
 	nouveau_switcheroo_optimus_dsm();
 	ret = nouveau_do_suspend(drm_dev, true);
+	if (ret) {
+		NV_ERROR(drm, "suspend failed with: %d\n", ret);
+		return ret;
+	}
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
 	pci_ignore_hotplug(pdev);
-- 
2.21.0


      parent reply index

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-14 21:31 [PATCH 0/7] Adding a proper workaround for fixing RTD3 issues with Nouveau Karol Herbst
2019-08-14 21:31 ` [PATCH 1/7] Revert "ACPI / OSI: Add OEM _OSI string to enable dGPU direct output" Karol Herbst
2019-08-14 21:49   ` Alex Hung
2019-08-14 22:47   ` [Nouveau] " Dave Airlie
2019-08-15 13:55     ` Mario.Limonciello
2019-08-15 14:04       ` Karol Herbst
2019-08-15 14:13         ` Alex Deucher
2019-08-15 14:15           ` Karol Herbst
2019-08-15 14:17             ` Alex Deucher
2019-08-15 14:23               ` Mario.Limonciello
2019-08-15 14:35                 ` Karol Herbst
2019-08-15 14:41                 ` Alex Deucher
2019-08-15 14:19         ` Mario.Limonciello
2019-08-15 14:25           ` Karol Herbst
2019-08-15 14:34             ` Mario.Limonciello
2019-08-15 14:36               ` Karol Herbst
2019-08-15 14:37             ` Alex Deucher
2019-08-15 14:56               ` Takashi Iwai
2019-08-15 16:19                 ` Mario.Limonciello
2019-08-15 17:43                   ` Takashi Iwai
2019-08-15 18:34                   ` Alex Deucher
2019-08-15 14:59               ` Alex Deucher
2019-08-15 14:11     ` Daniel Vetter
2019-08-19  9:52     ` Rafael J. Wysocki
2019-09-05 15:51       ` Karol Herbst
2019-09-05 16:26         ` Rafael J. Wysocki
2019-09-09 21:07           ` Alex Hung
2019-10-21  2:14           ` Alex Hung
2019-10-21  8:14             ` Rafael J. Wysocki
2019-10-21  8:48               ` Karol Herbst
2019-10-21  8:54                 ` Rafael J. Wysocki
2019-09-05 16:35         ` Alex Deucher
2019-08-14 21:31 ` [PATCH 2/7] Revert "ACPI / OSI: Add OEM _OSI string to enable NVidia HDMI audio" Karol Herbst
2019-08-14 21:31 ` [PATCH 3/7] Revert "ACPI / OSI: Add OEM _OSI strings to disable NVidia RTD3" Karol Herbst
2019-08-14 23:34   ` Alex Hung
2019-08-15  4:44     ` Karol Herbst
2019-08-14 21:31 ` [PATCH 4/7] drm/nouveau/pci: enable pcie link changes for pascal Karol Herbst
2019-08-14 21:31 ` [PATCH 5/7] drm/nouveau/pci: add nvkm_pcie_get_speed Karol Herbst
2019-08-14 21:31 ` [PATCH 6/7] drm/nouveau/pci: save the boot pcie link speed and restore it on fini Karol Herbst
2019-08-14 21:31 ` Karol Herbst [this message]

Reply instructions:

You may reply publically 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=20190814213118.28473-8-kherbst@redhat.com \
    --to=kherbst@redhat.com \
    --cc=airlied@redhat.com \
    --cc=alex.hung@canonical.com \
    --cc=bskeggs@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lyude@redhat.com \
    --cc=nouveau@lists.freedesktop.org \
    --cc=rafael.j.wysocki@intel.com \
    /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

Linux-ACPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-acpi/0 linux-acpi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-acpi linux-acpi/ https://lore.kernel.org/linux-acpi \
		linux-acpi@vger.kernel.org
	public-inbox-index linux-acpi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-acpi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git