Attachment 23050 Details for Bug 19939 – idle GEM at suspend, set it back up at resume

[patch] idle GEM at suspend, set it back up at resume

i915-kms-suspend-resume-fix.patch (text/plain), 2.45 KB, created by Jesse Barnes on 2009-02-17 15:10:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-02-17 15:10:24 UTC

Size: 2.45 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index a31cbdb..0692622 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -27,6 +27,7 @@
>  *
>  */
> 
>+#include <linux/device.h>
> #include "drmP.h"
> #include "drm.h"
> #include "i915_drm.h"
>@@ -66,6 +67,12 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
> 
> 	i915_save_state(dev);
> 
>+	/* If KMS is active, we do the leavevt stuff here */
>+	if (drm_core_check_feature(dev, DRIVER_MODESET) && i915_gem_idle(dev)) {
>+		dev_err(&dev->pdev->dev, "GEM idle failed, aborting suspend\n");
>+		return -EBUSY;
>+	}
>+
> 	intel_opregion_free(dev);
> 
> 	if (state.event == PM_EVENT_SUSPEND) {
>@@ -79,6 +86,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
> 
> static int i915_resume(struct drm_device *dev)
> {
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	int ret = 0;
>+
> 	pci_set_power_state(dev->pdev, PCI_D0);
> 	pci_restore_state(dev->pdev);
> 	if (pci_enable_device(dev->pdev))
>@@ -89,7 +99,18 @@ static int i915_resume(struct drm_device *dev)
> 
> 	intel_opregion_init(dev);
> 
>-	return 0;
>+	/* KMS EnterVT equivalent */
>+	if (drm_core_check_feature(dev, DRIVER_MODESET)) {
>+		mutex_lock(&dev->struct_mutex);
>+		dev_priv->mm.suspended = 0;
>+
>+		ret = i915_gem_init_ringbuffer(dev);
>+		if (ret != 0)
>+			ret = -1;
>+		mutex_unlock(&dev->struct_mutex);
>+	}
>+
>+	return ret;
> }
> 
> static struct vm_operations_struct i915_gem_vm_ops = {
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index a8d3256..2461d9b 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -621,6 +621,7 @@ int i915_gem_init_ringbuffer(struct drm_device *dev);
> void i915_gem_cleanup_ringbuffer(struct drm_device *dev);
> int i915_gem_do_init(struct drm_device *dev, unsigned long start,
> 		     unsigned long end);
>+int i915_gem_idle(struct drm_device *dev);
> int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
> int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
> 				      int write);
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index ac534c9..cd5101c 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2967,7 +2967,7 @@ i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
> 	return 0;
> }
> 
>-static int
>+int
> i915_gem_idle(struct drm_device *dev)
> {
> 	drm_i915_private_t *dev_priv = dev->dev_private;

Actions: View | Splinter Review

Attachments on bug 19939: 22546 | 22547 | 22548 | 22549 | 22550 | 23050

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.