Commit ff6c898f authored by Sean Paul's avatar Sean Paul
Browse files

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



This reverts commit 6067fddc.

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-8-sean@poorly.run
parent 7a154d5b

drivers/gpu/drm/omapdrm/omap_fb.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <drm/drm_modeset_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_drv.h>





#include "omap_dmm_tiler.h"

#include "omap_dmm_tiler.h"

#include "omap_drv.h"

#include "omap_drv.h"
@@ -63,17 +62,15 @@ static int omap_framebuffer_dirty(struct drm_framebuffer *fb, 
				  unsigned num_clips)

				  unsigned num_clips)

{

{

	struct drm_crtc *crtc;

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	int ret;





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

	drm_modeset_lock_all(fb->dev);





	drm_for_each_crtc(crtc, fb->dev)

	drm_for_each_crtc(crtc, fb->dev)

		omap_crtc_flush(crtc);

		omap_crtc_flush(crtc);





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

	drm_modeset_unlock_all(fb->dev);





	return ret;

	return 0;

}

}





static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {

static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {