Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25baccc7 authored by Samantha Tran's avatar Samantha Tran Committed by Gerrit - the friendly Code Review server
Browse files

Revert "drm/msm/disp/dpu: Remove unused code from drm_encoder.c" 



This reverts commit 2c7b48e7.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not be used in 4.19 downstream
display driver and these changes are made in the common layer
which affects the downstream driver functionalities. Separate
patches are submitted to revert the upstream driver and
introduce the downstream version of display driver.

Change-Id: Ic432588c26ac1027a8886662be931119d5f4468e
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent 3f9af052

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

+80 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,22 @@ 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;
@@ -1887,6 +1903,70 @@ 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;

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h

+8 −0
Original line number Diff line number Diff line
@@ -139,6 +139,14 @@ 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

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h

+9 −0
Original line number Diff line number Diff line
@@ -402,6 +402,15 @@ 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