Remove dpu_encoder_check_mode and dpu_encoder_helper_hw_release frmo drm_encoder.c as they appear to be unused.
Signed-off-by: Jordan Crouse jcrouse@codeaurora.org --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 80 ------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 8 -- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 9 --- 3 files changed, 97 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 27775feed32b..5c0051af5e98 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1627,22 +1627,6 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc) spin_unlock_irqrestore(&dpu_enc->enc_spinlock, lock_flags); }
-bool dpu_encoder_check_mode(struct drm_encoder *drm_enc, u32 mode) -{ - struct dpu_encoder_virt *dpu_enc; - struct msm_display_info *disp_info; - - if (!drm_enc) { - DPU_ERROR("invalid encoder\n"); - return false; - } - - dpu_enc = to_dpu_encoder_virt(drm_enc); - disp_info = &dpu_enc->disp_info; - - return (disp_info->capabilities & mode); -} - void dpu_encoder_trigger_kickoff_pending(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc; @@ -1903,70 +1887,6 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc) DPU_ATRACE_END("encoder_kickoff"); }
-int dpu_encoder_helper_hw_release(struct dpu_encoder_phys *phys_enc, - struct drm_framebuffer *fb) -{ - struct drm_encoder *drm_enc; - struct dpu_hw_mixer_cfg mixer; - struct dpu_rm_hw_iter lm_iter; - bool lm_valid = false; - - if (!phys_enc || !phys_enc->parent) { - DPU_ERROR("invalid encoder\n"); - return -EINVAL; - } - - drm_enc = phys_enc->parent; - memset(&mixer, 0, sizeof(mixer)); - - /* reset associated CTL/LMs */ - if (phys_enc->hw_ctl->ops.clear_pending_flush) - phys_enc->hw_ctl->ops.clear_pending_flush(phys_enc->hw_ctl); - if (phys_enc->hw_ctl->ops.clear_all_blendstages) - phys_enc->hw_ctl->ops.clear_all_blendstages(phys_enc->hw_ctl); - - dpu_rm_init_hw_iter(&lm_iter, drm_enc->base.id, DPU_HW_BLK_LM); - while (dpu_rm_get_hw(&phys_enc->dpu_kms->rm, &lm_iter)) { - struct dpu_hw_mixer *hw_lm = (struct dpu_hw_mixer *)lm_iter.hw; - - if (!hw_lm) - continue; - - /* need to flush LM to remove it */ - if (phys_enc->hw_ctl->ops.get_bitmask_mixer && - phys_enc->hw_ctl->ops.update_pending_flush) - phys_enc->hw_ctl->ops.update_pending_flush( - phys_enc->hw_ctl, - phys_enc->hw_ctl->ops.get_bitmask_mixer( - phys_enc->hw_ctl, hw_lm->idx)); - - if (fb) { - /* assume a single LM if targeting a frame buffer */ - if (lm_valid) - continue; - - mixer.out_height = fb->height; - mixer.out_width = fb->width; - - if (hw_lm->ops.setup_mixer_out) - hw_lm->ops.setup_mixer_out(hw_lm, &mixer); - } - - lm_valid = true; - - /* only enable border color on LM */ - if (phys_enc->hw_ctl->ops.setup_blendstage) - phys_enc->hw_ctl->ops.setup_blendstage( - phys_enc->hw_ctl, hw_lm->idx, NULL); - } - - if (!lm_valid) { - DPU_DEBUG_ENC(to_dpu_encoder_virt(drm_enc), "lm not found\n"); - return -EFAULT; - } - return 0; -} - void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc) { struct dpu_encoder_virt *dpu_enc; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h index ce92901ed227..204e538b0b74 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -139,14 +139,6 @@ enum dpu_intf_mode dpu_encoder_get_intf_mode(struct drm_encoder *encoder); */ void dpu_encoder_virt_restore(struct drm_encoder *encoder);
-/** - * dpu_encoder_check_mode - check if given mode is supported or not - * @drm_enc: Pointer to drm encoder object - * @mode: Mode to be checked - * @Return: true if it is cmd mode - */ -bool dpu_encoder_check_mode(struct drm_encoder *drm_enc, u32 mode); - /** * dpu_encoder_init - initialize virtual encoder object * @dev: Pointer to drm device structure diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h index 8505edddcc81..dacec1c8eeeb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h @@ -402,15 +402,6 @@ void dpu_encoder_helper_split_config( struct dpu_encoder_phys *phys_enc, enum dpu_intf interface);
-/** - * dpu_encoder_helper_hw_release - prepare for h/w reset during disable - * @phys_enc: Pointer to physical encoder structure - * @fb: Optional fb for specifying new mixer output resolution, may be NULL - * Return: Zero on success - */ -int dpu_encoder_helper_hw_release(struct dpu_encoder_phys *phys_enc, - struct drm_framebuffer *fb); - /** * dpu_encoder_helper_report_irq_timeout - utility to report error that irq has * timed out, including reporting frame error event to crtc and debug dump