iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Sean Paul 2021-10-02 11:45:34 -04:00
parent 7a154d5bbc
commit ff6c898f2e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/omapdrm/omap_fb.c
View File

@ -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 = {