Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a819515 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a0e99e68

drivers/gpu/drm/gma500/psb_device.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/gma500/psb_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -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: