Commit fcae996e authored by Sean Paul's avatar Sean Paul
Browse files

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



This reverts commit fd49ef52.

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-6-sean@poorly.run
parent 077b3191

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_rect.h>

#include <drm/drm_vblank.h>

#include <drm/drm_vblank.h>

#include <drm/drm_drv.h>





#include "dpu_kms.h"

#include "dpu_kms.h"

#include "dpu_hw_lm.h"

#include "dpu_hw_lm.h"
@@ -1173,15 +1172,14 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) 
	struct drm_display_mode *mode;

	struct drm_display_mode *mode;

	struct drm_framebuffer *fb;

	struct drm_framebuffer *fb;

	struct drm_plane_state *state;

	struct drm_plane_state *state;

	struct drm_modeset_acquire_ctx ctx;

	struct dpu_crtc_state *cstate;

	struct dpu_crtc_state *cstate;





	int i, out_width, ret;

	int i, out_width;





	dpu_crtc = s->private;

	dpu_crtc = s->private;

	crtc = &dpu_crtc->base;

	crtc = &dpu_crtc->base;





	DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret);

	drm_modeset_lock_all(crtc->dev);

	cstate = to_dpu_crtc_state(crtc->state);

	cstate = to_dpu_crtc_state(crtc->state);





	mode = &crtc->state->adjusted_mode;

	mode = &crtc->state->adjusted_mode;
@@ -1265,9 +1263,9 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) 
		dpu_crtc->vblank_cb_time = ktime_set(0, 0);

		dpu_crtc->vblank_cb_time = ktime_set(0, 0);

	}

	}





	DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret);

	drm_modeset_unlock_all(crtc->dev);





	return ret;

	return 0;

}

}





DEFINE_SHOW_ATTRIBUTE(_dpu_debugfs_status);

DEFINE_SHOW_ATTRIBUTE(_dpu_debugfs_status);