drm: claim PCI device when running in modesetting mode.

Under kernel modesetting, we manage the device at all times, regardless
of VT switching and X servers, so the only decent thing to do is to
claim the PCI device.  In that case, we call the suspend/resume hooks
directly from the pci driver hooks instead of the current class device detour.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 5aa6780652aa..480546b542fe 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -35,7 +35,9 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state)
         struct drm_minor *drm_minor = to_drm_minor(dev);
         struct drm_device *drm_dev = drm_minor->dev;
 
-        if (drm_minor->type == DRM_MINOR_LEGACY && drm_dev->driver->suspend)
+        if (drm_minor->type == DRM_MINOR_LEGACY &&
+            !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
+            drm_dev->driver->suspend)
                 return drm_dev->driver->suspend(drm_dev, state);
 
         return 0;
@@ -53,7 +55,9 @@ static int drm_sysfs_resume(struct device *dev)
         struct drm_minor *drm_minor = to_drm_minor(dev);
         struct drm_device *drm_dev = drm_minor->dev;
 
-        if (drm_minor->type == DRM_MINOR_LEGACY && drm_dev->driver->resume)
+        if (drm_minor->type == DRM_MINOR_LEGACY &&
+            !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&
+            drm_dev->driver->resume)
                 return drm_dev->driver->resume(drm_dev);
 
         return 0;