Skip to content

Commit

Permalink
Revert "drm/omapdrm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_…
Browse files Browse the repository at this point in the history
…LOCK_ALL_BEGIN()"

This reverts commit 6067fdd.

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
  • Loading branch information
Sean Paul committed Oct 4, 2021
1 parent 7a154d5 commit ff6c898
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/gpu/drm/omapdrm/omap_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit ff6c898

Please sign in to comment.