Skip to contentSkip to conversation

drm: don't continue with anything after the GPU couldn't be woken up

PATCH In review Karol Herbst 4 participants 5 messages Nov 21, 2017 – Nov 22, 2017 1 message not in the archive PCI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm: don't continue with anything after the GPU couldn't be woken up

This should make systems more stable where resuming the GPU fails. This can happen due to bad firmware or due to a bug within the kernel. The last thing which should happen in either case is an unusable system.

v2: do the same in nouveau_pmops_resume

---
 drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drm/nouveau/nouveau_drm.c +23 -8
index 8d4a5be3..6e4cb4f7 100644
@@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev)
 	return 0;
 }
 
+static int
+nouveau_set_power_state_D0(struct pci_dev *pdev)
+{
+	struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
+	int ret;
+
+	pci_set_power_state(pdev, PCI_D0);
+	/* abort if anything went wrong */
+	if (pdev->current_state != PCI_D0) {
+		NV_ERROR(drm, "couldn't wake up GPU!\n");
+		return -EBUSY;
+	}
+	pci_restore_state(pdev);
+	ret = pci_enable_device(pdev);
+	if (ret)
+		return ret;
+
+	pci_set_master(pdev);
+	return 0;
+}
+
 int
 nouveau_pmops_resume(struct device *dev)
 {
@@ -803,12 +824,9 @@ nouveau_pmops_resume(struct device *dev)
 	    drm_dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF)
 		return 0;
 
-	pci_set_power_state(pdev, PCI_D0);
-	pci_restore_state(pdev);
-	ret = pci_enable_device(pdev);
+	ret = nouveau_set_power_state_D0(pdev);
 	if (ret)
 		return ret;
-	pci_set_master(pdev);
 
 	ret = nouveau_do_resume(drm_dev, false);
 
@@ -879,12 +897,9 @@ nouveau_pmops_runtime_resume(struct device *dev)
 		return -EBUSY;
 	}
 
-	pci_set_power_state(pdev, PCI_D0);
-	pci_restore_state(pdev);
-	ret = pci_enable_device(pdev);
+	ret = nouveau_set_power_state_D0(pdev);
 	if (ret)
 		return ret;
-	pci_set_master(pdev);
 
 	ret = nouveau_do_resume(drm_dev, true);
 
Signature · 6 lines
2.14.3

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

A message that is not in the archive (sent off-list or not yet received): 20171121150116.24956-1-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#2 lore raw
Quoted 22 lines · Karol Herbst

This should make systems more stable where resuming the GPU fails. This can happen due to bad firmware or due to a bug within the kernel. The last thing which should happen in either case is an unusable system.

v2: do the same in nouveau_pmops_resume

---
 drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drm/nouveau/nouveau_drm.c +2 -0
index 8d4a5be3..6e4cb4f7 100644
@@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev)
 	return 0;
 }
 
+static int
+nouveau_set_power_state_D0(struct pci_dev *pdev)

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 806

Quoted 10 lines
drm/nouveau/nouveau_drm.c +10 -0
+{
+	struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
+	int ret;
+
+	pci_set_power_state(pdev, PCI_D0);
+	/* abort if anything went wrong */
+	if (pdev->current_state != PCI_D0) {
+		NV_ERROR(drm, "couldn't wake up GPU!\n");
+		return -EBUSY;
+	}

Looks to me like the more idiomatic way to do this is:

	ret = pci_set_power_state(pdev, PCI_D0);
	if (ret < 0 && ret != -EIO)
		return ret;

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 812

Quoted 6 lines
drm/nouveau/nouveau_drm.c +6 -0
+	pci_restore_state(pdev);
+	ret = pci_enable_device(pdev);
+	if (ret)
+		return ret;
+
+	pci_set_master(pdev);

Looking closer it also seems like pci_enable_device() will already set the power state to D0 (via do_pci_enable_device()). Is the sequence above really necessary because the hardware is quirky, or was it cargo-culted?

Thierry

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

#3 lore raw
Quoted 36 lines · Thierry Reding
Quoted 22 lines · Karol Herbst

This should make systems more stable where resuming the GPU fails. This can happen due to bad firmware or due to a bug within the kernel. The last thing which should happen in either case is an unusable system.

v2: do the same in nouveau_pmops_resume

---
 drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drm/nouveau/nouveau_drm.c +2 -0
index 8d4a5be3..6e4cb4f7 100644
@@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev)
      return 0;
 }
 
+static int
+nouveau_set_power_state_D0(struct pci_dev *pdev)

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 806

Quoted 10 lines
drm/nouveau/nouveau_drm.c +10 -0
+{
+     struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
+     int ret;
+
+     pci_set_power_state(pdev, PCI_D0);
+     /* abort if anything went wrong */
+     if (pdev->current_state != PCI_D0) {
+             NV_ERROR(drm, "couldn't wake up GPU!\n");
+             return -EBUSY;
+     }

Looks to me like the more idiomatic way to do this is:

Quoted 4 lines
        ret = pci_set_power_state(pdev, PCI_D0);
        if (ret < 0 && ret != -EIO)
                return ret;

I thought so too, but it ends up returning 0 even if setting the power state fails. Or maybe I did something wrong when installing the kernel. I could take another shot at it, but what I came up with seems to work. Adding airlied in CC, because he saw my patch and didn't complain about it. Hopefully he knows more.

Quoted 7 lines

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 812

Quoted 6 lines
drm/nouveau/nouveau_drm.c +6 -0
+     pci_restore_state(pdev);
+     ret = pci_enable_device(pdev);
+     if (ret)
+             return ret;
+
+     pci_set_master(pdev);
Quoted 6 lines

Looking closer it also seems like pci_enable_device() will already set the power state to D0 (via do_pci_enable_device()). Is the sequence above really necessary because the hardware is quirky, or was it cargo-culted?

Thierry

No clue. And because it was already there in the original code I didn't really felt like doing anything with it.
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

#4 lore raw
Quoted 43 lines · Karol Herbst
Quoted 36 lines · Thierry Reding
Quoted 22 lines · Karol Herbst

This should make systems more stable where resuming the GPU fails. This can happen due to bad firmware or due to a bug within the kernel. The last thing which should happen in either case is an unusable system.

v2: do the same in nouveau_pmops_resume

---
 drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drm/nouveau/nouveau_drm.c +2 -0
index 8d4a5be3..6e4cb4f7 100644
@@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev)
      return 0;
 }
 
+static int
+nouveau_set_power_state_D0(struct pci_dev *pdev)

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 806

Quoted 10 lines
drm/nouveau/nouveau_drm.c +10 -0
+{
+     struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
+     int ret;
+
+     pci_set_power_state(pdev, PCI_D0);
+     /* abort if anything went wrong */
+     if (pdev->current_state != PCI_D0) {
+             NV_ERROR(drm, "couldn't wake up GPU!\n");
+             return -EBUSY;
+     }

Looks to me like the more idiomatic way to do this is:

Quoted 4 lines
        ret = pci_set_power_state(pdev, PCI_D0);
        if (ret < 0 && ret != -EIO)
                return ret;
Quoted 5 lines

I thought so too, but it ends up returning 0 even if setting the power state fails. Or maybe I did something wrong when installing the kernel. I could take another shot at it, but what I came up with seems to work. Adding airlied in CC, because he saw my patch and didn't complain about it. Hopefully he knows more.

pci_raw_set_power_state(), called by pci_set_power_state(), contains this, which looks to me like it would be the only case where the problem you're describing could be coming from:

	dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
	if (dev->current_state != state && printk_ratelimit())
		dev_info(&dev->dev, "Refused to change power state, currently in D%d\n",
			 dev->current_state);

Do you happen to see this in the kernel logs? Perhaps this should be considered an error rather than just an KERN_INFO level message?

Adding Bjorn and linux-pci for visibility.

Thierry

#5 lore raw
Quoted 59 lines · Thierry Reding
Quoted 43 lines · Karol Herbst
Quoted 36 lines · Thierry Reding
Quoted 22 lines · Karol Herbst

This should make systems more stable where resuming the GPU fails. This can happen due to bad firmware or due to a bug within the kernel. The last thing which should happen in either case is an unusable system.

v2: do the same in nouveau_pmops_resume

---
 drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)
drm/nouveau/nouveau_drm.c +2 -0
index 8d4a5be3..6e4cb4f7 100644
@@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev)
      return 0;
 }
 
+static int
+nouveau_set_power_state_D0(struct pci_dev *pdev)

drm/nouveau/nouveau_drm.c nouveau_pmops_suspend(struct device *dev) · line 806

Quoted 10 lines
drm/nouveau/nouveau_drm.c +10 -0
+{
+     struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev));
+     int ret;
+
+     pci_set_power_state(pdev, PCI_D0);
+     /* abort if anything went wrong */
+     if (pdev->current_state != PCI_D0) {
+             NV_ERROR(drm, "couldn't wake up GPU!\n");
+             return -EBUSY;
+     }

Looks to me like the more idiomatic way to do this is:

Quoted 4 lines
        ret = pci_set_power_state(pdev, PCI_D0);
        if (ret < 0 && ret != -EIO)
                return ret;
Quoted 5 lines

I thought so too, but it ends up returning 0 even if setting the power state fails. Or maybe I did something wrong when installing the kernel. I could take another shot at it, but what I came up with seems to work. Adding airlied in CC, because he saw my patch and didn't complain about it. Hopefully he knows more.

pci_raw_set_power_state(), called by pci_set_power_state(), contains this, which looks to me like it would be the only case where the problem you're describing could be coming from:

        dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
        if (dev->current_state != state && printk_ratelimit())
                dev_info(&dev->dev, "Refused to change power state, currently in D%d\n",
                         dev->current_state);
Quoted 6 lines

Do you happen to see this in the kernel logs? Perhaps this should be considered an error rather than just an KERN_INFO level message?

Adding Bjorn and linux-pci for visibility.

Thierry

yeah, that is the error we have in dmesg.