Commit 76fd2c37 authored by Sean Paul's avatar Sean Paul
Browse files

Revert "drm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" 



This reverts commit 7c5f2eec.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fernando Ramos <greenfoo@u92.eu>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-13-sean@poorly.run
parent e7b48185

drivers/gpu/drm/drm_client_modeset.c

+2 −3
Original line number Diff line number Diff line
@@ -1062,10 +1062,9 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client) 
	struct drm_device *dev = client->dev;

	struct drm_mode_set *mode_set;

	struct drm_plane *plane;

	struct drm_modeset_acquire_ctx ctx;

	int ret = 0;



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

	drm_for_each_plane(plane, dev) {

		if (plane->type != DRM_PLANE_TYPE_PRIMARY)

			drm_plane_force_disable(plane);
@@ -1094,7 +1093,7 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client) 
			goto out;

	}

out:

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);



	return ret;

}

drivers/gpu/drm/drm_crtc_helper.c

+6 −12
Original line number Diff line number Diff line
@@ -218,14 +218,11 @@ static void __drm_helper_disable_unused_functions(struct drm_device *dev) 
 */

void drm_helper_disable_unused_functions(struct drm_device *dev)

{

	struct drm_modeset_acquire_ctx ctx;

	int ret;



	WARN_ON(drm_drv_uses_atomic_modeset(dev));



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

	__drm_helper_disable_unused_functions(dev);

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);

}

EXPORT_SYMBOL(drm_helper_disable_unused_functions);
@@ -945,14 +942,12 @@ void drm_helper_resume_force_mode(struct drm_device *dev) 
	struct drm_crtc *crtc;

	struct drm_encoder *encoder;

	const struct drm_crtc_helper_funcs *crtc_funcs;

	struct drm_modeset_acquire_ctx ctx;

	int encoder_dpms;

	bool ret;

	int err;



	WARN_ON(drm_drv_uses_atomic_modeset(dev));



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err);

	drm_modeset_lock_all(dev);

	drm_for_each_crtc(crtc, dev) {



		if (!crtc->enabled)
@@ -987,7 +982,7 @@ void drm_helper_resume_force_mode(struct drm_device *dev) 


	/* disable the unused connectors while restoring the modesetting */

	__drm_helper_disable_unused_functions(dev);

	DRM_MODESET_LOCK_ALL_END(dev, ctx, err);

	drm_modeset_unlock_all(dev);

}

EXPORT_SYMBOL(drm_helper_resume_force_mode);
@@ -1007,10 +1002,9 @@ EXPORT_SYMBOL(drm_helper_resume_force_mode); 
int drm_helper_force_disable_all(struct drm_device *dev)

{

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	int ret = 0;



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

	drm_for_each_crtc(crtc, dev)

		if (crtc->enabled) {

			struct drm_mode_set set = {
@@ -1022,7 +1016,7 @@ int drm_helper_force_disable_all(struct drm_device *dev) 
				goto out;

		}

out:

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);

	return ret;

}

EXPORT_SYMBOL(drm_helper_force_disable_all);

drivers/gpu/drm/drm_fb_helper.c

+4 −6
Original line number Diff line number Diff line
@@ -940,11 +940,10 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) 
	struct drm_fb_helper *fb_helper = info->par;

	struct drm_mode_set *modeset;

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	u16 *r, *g, *b;

	int ret = 0;



	DRM_MODESET_LOCK_ALL_BEGIN(fb_helper->dev, ctx, 0, ret);

	drm_modeset_lock_all(fb_helper->dev);

	drm_client_for_each_modeset(modeset, &fb_helper->client) {

		crtc = modeset->crtc;

		if (!crtc->funcs->gamma_set || !crtc->gamma_size) {
@@ -971,7 +970,7 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) 
			goto out;

	}

out:

	DRM_MODESET_LOCK_ALL_END(fb_helper->dev, ctx, ret);

	drm_modeset_unlock_all(fb_helper->dev);



	return ret;

}
@@ -1442,11 +1441,10 @@ static int pan_display_legacy(struct fb_var_screeninfo *var, 
	struct drm_fb_helper *fb_helper = info->par;

	struct drm_client_dev *client = &fb_helper->client;

	struct drm_mode_set *modeset;

	struct drm_modeset_acquire_ctx ctx;

	int ret = 0;



	mutex_lock(&client->modeset_mutex);

	DRM_MODESET_LOCK_ALL_BEGIN(fb_helper->dev, ctx, 0, ret);

	drm_modeset_lock_all(fb_helper->dev);

	drm_client_for_each_modeset(modeset, client) {

		modeset->x = var->xoffset;

		modeset->y = var->yoffset;
@@ -1459,7 +1457,7 @@ static int pan_display_legacy(struct fb_var_screeninfo *var, 
			}

		}

	}

	DRM_MODESET_LOCK_ALL_END(fb_helper->dev, ctx, ret);

	drm_modeset_unlock_all(fb_helper->dev);

	mutex_unlock(&client->modeset_mutex);



	return ret;

drivers/gpu/drm/drm_framebuffer.c

+2 −4
Original line number Diff line number Diff line
@@ -1059,10 +1059,8 @@ static void legacy_remove_fb(struct drm_framebuffer *fb) 
	struct drm_device *dev = fb->dev;

	struct drm_crtc *crtc;

	struct drm_plane *plane;

	struct drm_modeset_acquire_ctx ctx;

	int ret;



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

	/* remove from any CRTC */

	drm_for_each_crtc(crtc, dev) {

		if (crtc->primary->fb == fb) {
@@ -1084,7 +1082,7 @@ static void legacy_remove_fb(struct drm_framebuffer *fb) 
			drm_plane_force_disable(plane);

		}

	}

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);

}



/**