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

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

This reverts commit fd49ef52e2db015ce69ad02bab0702489d141a41.

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-6-sean@poorly.run

+4 -6
+4 -6
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
··· 18 18 #include <drm/drm_probe_helper.h> 19 19 #include <drm/drm_rect.h> 20 20 #include <drm/drm_vblank.h> 21 - #include <drm/drm_drv.h> 22 21 23 22 #include "dpu_kms.h" 24 23 #include "dpu_hw_lm.h" ··· 1172 1173 struct drm_display_mode *mode; 1173 1174 struct drm_framebuffer *fb; 1174 1175 struct drm_plane_state *state; 1175 - struct drm_modeset_acquire_ctx ctx; 1176 1176 struct dpu_crtc_state *cstate; 1177 1177 1178 - int i, out_width, ret; 1178 + int i, out_width; 1179 1179 1180 1180 dpu_crtc = s->private; 1181 1181 crtc = &dpu_crtc->base; 1182 1182 1183 - DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret); 1183 + drm_modeset_lock_all(crtc->dev); 1184 1184 cstate = to_dpu_crtc_state(crtc->state); 1185 1185 1186 1186 mode = &crtc->state->adjusted_mode; ··· 1263 1265 dpu_crtc->vblank_cb_time = ktime_set(0, 0); 1264 1266 } 1265 1267 1266 - DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret); 1268 + drm_modeset_unlock_all(crtc->dev); 1267 1269 1268 - return ret; 1270 + return 0; 1269 1271 } 1270 1272 1271 1273 DEFINE_SHOW_ATTRIBUTE(_dpu_debugfs_status);