@@ -45,7 +45,6 @@ static int __drm_class_suspend(struct device *dev, pm_message_t state)
struct drm_device *drm_dev = drm_minor->dev;
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);
}
@@ -86,7 +85,6 @@ static int drm_class_resume(struct device *dev)
struct drm_device *drm_dev = drm_minor->dev;
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);
}
Implementing suspend/resume functionality in componentized drm drivers using master component PM callbacks is problematic because those callbacks can be called asynchronously regardless of existence/state of drm device. The patch re-enables suspend/resume drm driver callbacks in drivers with modeset feature enabled. These callback can be used to implement suspend/resume functionality in more convenient way. The patch should not affect behavior of existing drm drivers. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/drm_sysfs.c | 2 -- 1 file changed, 2 deletions(-)