drm/msm: dpu: Grab the modeset locks in frame_event

This patch wraps dpu_core_perf_crtc_release_bw() with modeset locks
since it digs into the state objects.

Changes in v2:
- None
Changes in v3:
- Use those nifty new DRM_MODESET_LOCK_ALL_* helpers (Daniel)

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Sean Paul 2018-11-30 17:00:02 -05:00 committed by Rob Clark
parent b01c239922
commit f449aa6e44

View File

@ -306,6 +306,19 @@ static void dpu_crtc_vblank_cb(void *data)
trace_dpu_crtc_vblank_cb(DRMID(crtc)); trace_dpu_crtc_vblank_cb(DRMID(crtc));
} }
static void dpu_crtc_release_bw_unlocked(struct drm_crtc *crtc)
{
int ret = 0;
struct drm_modeset_acquire_ctx ctx;
DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret);
dpu_core_perf_crtc_release_bw(crtc);
DRM_MODESET_LOCK_ALL_END(ctx, ret);
if (ret)
DRM_ERROR("Failed to acquire modeset locks to release bw, %d\n",
ret);
}
static void dpu_crtc_frame_event_work(struct kthread_work *work) static void dpu_crtc_frame_event_work(struct kthread_work *work)
{ {
struct dpu_crtc_frame_event *fevent = container_of(work, struct dpu_crtc_frame_event *fevent = container_of(work,
@ -335,7 +348,7 @@ static void dpu_crtc_frame_event_work(struct kthread_work *work)
/* release bandwidth and other resources */ /* release bandwidth and other resources */
trace_dpu_crtc_frame_event_done(DRMID(crtc), trace_dpu_crtc_frame_event_done(DRMID(crtc),
fevent->event); fevent->event);
dpu_core_perf_crtc_release_bw(crtc); dpu_crtc_release_bw_unlocked(crtc);
} else { } else {
trace_dpu_crtc_frame_event_more_pending(DRMID(crtc), trace_dpu_crtc_frame_event_more_pending(DRMID(crtc),
fevent->event); fevent->event);