It's not called anywhere. Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 44 ----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 --- drivers/gpu/drm/msm/msm_kms.h | 3 -- 3 files changed, 51 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 4011525e1d7e..a3bc4c694c0e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -319,49 +319,6 @@ static void dpu_kms_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) dpu_crtc_vblank(crtc, false); } -static void dpu_kms_wait_for_frame_transfer_complete(struct msm_kms *kms, - struct drm_crtc *crtc) -{ - struct drm_encoder *encoder; - struct drm_device *dev; - int ret; - - if (!kms || !crtc || !crtc->state || !crtc->dev) { - DPU_ERROR("invalid params\n"); - return; - } - - if (!crtc->state->enable) { - DPU_DEBUG("[crtc:%d] not enable\n", crtc->base.id); - return; - } - - if (!crtc->state->active) { - DPU_DEBUG("[crtc:%d] not active\n", crtc->base.id); - return; - } - - dev = crtc->dev; - - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - if (encoder->crtc != crtc) - continue; - /* - * Video Mode - Wait for VSYNC - * Cmd Mode - Wait for PP_DONE. Will be no-op if transfer is - * complete - */ - trace_dpu_kms_wait_for_frame_transfer(DRMID(crtc)); - ret = dpu_encoder_wait_for_event(encoder, MSM_ENC_TX_COMPLETE); - if (ret && ret != -EWOULDBLOCK) { - DPU_ERROR( - "[crtc: %d][enc: %d] wait for commit done returned %d\n", - crtc->base.id, encoder->base.id, ret); - break; - } - } -} - static void dpu_kms_prepare_commit(struct msm_kms *kms, struct drm_atomic_state *state) { @@ -933,7 +890,6 @@ static const struct msm_kms_funcs kms_funcs = { .commit = dpu_kms_commit, .complete_commit = dpu_kms_complete_commit, .wait_for_crtc_commit_done = dpu_kms_wait_for_commit_done, - .wait_for_tx_complete = dpu_kms_wait_for_frame_transfer_complete, .enable_vblank = dpu_kms_enable_vblank, .disable_vblank = dpu_kms_disable_vblank, .check_modified_format = dpu_format_check_modified_format, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h index 1924c6662362..76efc690cce3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -307,10 +307,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) ); -DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_wait_for_frame_transfer, - TP_PROTO(uint32_t drm_id), - TP_ARGS(drm_id) -); DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_enc_enable, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 93e46d75bf56..6b5535270276 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -48,9 +48,6 @@ struct msm_kms_funcs { /* functions to wait for atomic commit completed on each CRTC */ void (*wait_for_crtc_commit_done)(struct msm_kms *kms, struct drm_crtc *crtc); - /* function pointer to wait for pixel transfer to panel to complete*/ - void (*wait_for_tx_complete)(struct msm_kms *kms, - struct drm_crtc *crtc); /* get msm_format w/ optional format modifiers from drm_mode_fb_cmd2 */ const struct msm_format *(*get_format)(struct msm_kms *kms, const uint32_t format, -- Sean Paul, Software Engineer, Google / Chromium OS -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html