drm/gma500: use drm_modeset_lock_all

Only two places:
- suspend/resume
- Some really strange mode validation tool with too much funny-lucking
  hand-rolled conversion code.
- The recently-added lastclose fbdev restore code.

Better safe than sorry, so convert both places to keep the locking
semantics as much as possible.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index b58c4701c4e8f50d98c1ca9464e1399a0b4d4c94..f6f534b4197e783c6efbab8256f09321dc33179e 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -194,7 +194,7 @@ static int psb_save_display_registers(struct drm_device *dev)
        regs->saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);
 
        /* Save crtc and output state */
-       mutex_lock(&dev->mode_config.mutex);
+       drm_modeset_lock_all(dev);
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                if (drm_helper_crtc_in_use(crtc))
                        crtc->funcs->save(crtc);
@@ -204,7 +204,7 @@ static int psb_save_display_registers(struct drm_device *dev)
                if (connector->funcs->save)
                        connector->funcs->save(connector);
 
-       mutex_unlock(&dev->mode_config.mutex);
+       drm_modeset_unlock_all(dev);
        return 0;
 }
 
@@ -234,7 +234,7 @@ static int psb_restore_display_registers(struct drm_device *dev)
        /*make sure VGA plane is off. it initializes to on after reset!*/
        PSB_WVDC32(0x80000000, VGACNTRL);
 
-       mutex_lock(&dev->mode_config.mutex);
+       drm_modeset_lock_all(dev);
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
                if (drm_helper_crtc_in_use(crtc))
                        crtc->funcs->restore(crtc);
@@ -243,7 +243,7 @@ static int psb_restore_display_registers(struct drm_device *dev)
                if (connector->funcs->restore)
                        connector->funcs->restore(connector);
 
-       mutex_unlock(&dev->mode_config.mutex);
+       drm_modeset_unlock_all(dev);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index dbcefe9f78fabc8d06b292607d79a19c9bec8c7a..111e3df9c5de380434460bd931805f4a1072f6cc 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -153,11 +153,11 @@ static void psb_lastclose(struct drm_device *dev)
        struct drm_psb_private *dev_priv = dev->dev_private;
        struct psb_fbdev *fbdev = dev_priv->fbdev;
 
-       mutex_lock(&dev->mode_config.mutex);
+       drm_modeset_lock_all(dev);
        ret = drm_fb_helper_restore_fbdev_mode(&fbdev->psb_fb_helper);
        if (ret)
                DRM_DEBUG("failed to restore crtc mode\n");
-       mutex_unlock(&dev->mode_config.mutex);
+       drm_modeset_unlock_all(dev);
 
        return;
 }
@@ -486,7 +486,7 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
        case PSB_MODE_OPERATION_MODE_VALID:
                umode = &arg->mode;
 
-               mutex_lock(&dev->mode_config.mutex);
+               drm_modeset_lock_all(dev);
 
                obj = drm_mode_object_find(dev, obj_id,
                                        DRM_MODE_OBJECT_CONNECTOR);
@@ -535,7 +535,7 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
                if (mode)
                        drm_mode_destroy(dev, mode);
 mode_op_out:
-               mutex_unlock(&dev->mode_config.mutex);
+               drm_modeset_unlock_all(dev);
                return ret;
 
        default: