From 1579f6ca48a2427aeada4e1b66d811bba29f0657 Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Sat, 2 Oct 2021 11:45:34 -0400
Subject: Revert "drm/omapdrm: cleanup: drm_modeset_lock_all() -->
DRM_MODESET_LOCK_ALL_BEGIN()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: ff6c898f2e73a68626ded79bd4a831f5a25b7598
Patch-mainline: v5.16-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225
This reverts commit 6067fddc1a4fdf155787ab6182c192e4b360b73c.
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: Ville Syrj채l채 <ville.syrjala@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-8-sean@poorly.run
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/omapdrm/omap_fb.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index fa7636c13c19..190afc564914 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -9,7 +9,6 @@
#include <drm/drm_modeset_helper.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_gem_framebuffer_helper.h>
-#include <drm/drm_drv.h>
#include "omap_dmm_tiler.h"
#include "omap_drv.h"
@@ -63,17 +62,15 @@ static int omap_framebuffer_dirty(struct drm_framebuffer *fb,
unsigned num_clips)
{
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)
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 = {
--
2.38.1