Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

+3 -6
+3 -6
drivers/gpu/drm/omapdrm/omap_fb.c
··· 9 9 #include <drm/drm_modeset_helper.h> 10 10 #include <drm/drm_fourcc.h> 11 11 #include <drm/drm_gem_framebuffer_helper.h> 12 - #include <drm/drm_drv.h> 13 12 14 13 #include "omap_dmm_tiler.h" 15 14 #include "omap_drv.h" ··· 62 63 unsigned num_clips) 63 64 { 64 65 struct drm_crtc *crtc; 65 - struct drm_modeset_acquire_ctx ctx; 66 - int ret; 67 66 68 - DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, 0, ret); 67 + drm_modeset_lock_all(fb->dev); 69 68 70 69 drm_for_each_crtc(crtc, fb->dev) 71 70 omap_crtc_flush(crtc); 72 71 73 - DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret); 72 + drm_modeset_unlock_all(fb->dev); 74 73 75 - return ret; 74 + return 0; 76 75 } 77 76 78 77 static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {