Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[karo-tx-linux.git] / drivers / gpu / drm / drm_sysfs.c

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 02296653a058a6f5dd0473ae065304bda4b3ea93..2290b3b7383247a6dde176d71ee1e6fe18d7b4c7 100644 (file)
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -30,14 +30,14 @@ static struct device_type drm_sysfs_device_minor = {
 };
 
 /**
- * drm_class_suspend - DRM class suspend hook
+ * __drm_class_suspend - internal DRM class suspend routine
  * @dev: Linux device to suspend
  * @state: power state to enter
  *
  * Just figures out what the actual struct drm_device associated with
  * @dev is and calls its suspend hook, if present.
  */
-static int drm_class_suspend(struct device *dev, pm_message_t state)
+static int __drm_class_suspend(struct device *dev, pm_message_t state)
 {
        if (dev->type == &drm_sysfs_device_minor) {
                struct drm_minor *drm_minor = to_drm_minor(dev);
@@ -51,6 +51,26 @@ static int drm_class_suspend(struct device *dev, pm_message_t state)
        return 0;
 }
 
+/**
+ * drm_class_suspend - internal DRM class suspend hook. Simply calls
+ * __drm_class_suspend() with the correct pm state.
+ * @dev: Linux device to suspend
+ */
+static int drm_class_suspend(struct device *dev)
+{
+       return __drm_class_suspend(dev, PMSG_SUSPEND);
+}
+
+/**
+ * drm_class_freeze - internal DRM class freeze hook. Simply calls
+ * __drm_class_suspend() with the correct pm state.
+ * @dev: Linux device to freeze
+ */
+static int drm_class_freeze(struct device *dev)
+{
+       return __drm_class_suspend(dev, PMSG_FREEZE);
+}
+
 /**
  * drm_class_resume - DRM class resume hook
  * @dev: Linux device to resume
@@ -72,6 +92,12 @@ static int drm_class_resume(struct device *dev)
        return 0;
 }
 
+static const struct dev_pm_ops drm_class_dev_pm_ops = {
+       .suspend        = drm_class_suspend,
+       .resume         = drm_class_resume,
+       .freeze         = drm_class_freeze,
+};
+
 static char *drm_devnode(struct device *dev, umode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
@@ -106,8 +132,7 @@ struct class *drm_sysfs_create(struct module *owner, char *name)
                goto err_out;
        }
 
-       class->suspend = drm_class_suspend;
-       class->resume = drm_class_resume;
+       class->pm = &drm_class_dev_pm_ops;
 
        err = class_create_file(class, &class_attr_version.attr);
        if (err)