| @@ -474,28 +474,33 @@ static int i915_drm_freeze(struct drm_de | | | @@ -474,28 +474,33 @@ static int i915_drm_freeze(struct drm_de |
| 474 | { | | 474 | { |
| 475 | struct drm_i915_private *dev_priv = dev->dev_private; | | 475 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 476 | | | 476 | |
| 477 | drm_kms_helper_poll_disable(dev); | | 477 | drm_kms_helper_poll_disable(dev); |
| 478 | | | 478 | |
| 479 | #ifndef __NetBSD__ /* pmf handles this for us. */ | | 479 | #ifndef __NetBSD__ /* pmf handles this for us. */ |
| 480 | pci_save_state(dev->pdev); | | 480 | pci_save_state(dev->pdev); |
| 481 | #endif | | 481 | #endif |
| 482 | | | 482 | |
| 483 | /* If KMS is active, we do the leavevt stuff here */ | | 483 | /* If KMS is active, we do the leavevt stuff here */ |
| 484 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | | 484 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
| 485 | int error = i915_gem_idle(dev); | | 485 | int error = i915_gem_idle(dev); |
| 486 | if (error) { | | 486 | if (error) { |
| | | 487 | #ifdef __NetBSD__ |
| | | 488 | dev_err(pci_dev_dev(dev->pdev), |
| | | 489 | "GEM idle failed, resume might fail\n"); |
| | | 490 | #else |
| 487 | dev_err(&dev->pdev->dev, | | 491 | dev_err(&dev->pdev->dev, |
| 488 | "GEM idle failed, resume might fail\n"); | | 492 | "GEM idle failed, resume might fail\n"); |
| | | 493 | #endif |
| 489 | return error; | | 494 | return error; |
| 490 | } | | 495 | } |
| 491 | | | 496 | |
| 492 | cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); | | 497 | cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); |
| 493 | | | 498 | |
| 494 | intel_modeset_disable(dev); | | 499 | intel_modeset_disable(dev); |
| 495 | | | 500 | |
| 496 | drm_irq_uninstall(dev); | | 501 | drm_irq_uninstall(dev); |
| 497 | } | | 502 | } |
| 498 | | | 503 | |
| 499 | i915_save_state(dev); | | 504 | i915_save_state(dev); |
| 500 | | | 505 | |
| 501 | intel_opregion_fini(dev); | | 506 | intel_opregion_fini(dev); |