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

Commit 09dad7e7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: add verbose evtlogs for debug purpose"

parents 4e1159d7 d1b2e0be

msm/msm_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, 


			DRM_DEBUG("detach nsec-dev:%pK attach sec-dev:%pK\n",

					obj->import_attach->dev, dev);

			SDE_EVT32(obj->import_attach->dev, dev, msm_obj->sgt);

			SDE_EVT32(obj->import_attach->dev, dev, msm_obj->sgt,

					 msm_obj->obj_dirty);



			if (msm_obj->sgt)

				dma_buf_unmap_attachment(obj->import_attach,

msm/msm_smmu.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int msm_smmu_map_dma_buf(struct msm_mmu *mmu, struct sg_table *sgt, 
				&sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir, attrs);

		SDE_EVT32(sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir, attrs, client->secure);

				dir, attrs, client->secure, flags);

	}



	return 0;
@@ -281,7 +281,7 @@ static void msm_smmu_unmap_dma_buf(struct msm_mmu *mmu, struct sg_table *sgt, 
				&sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir);

		SDE_EVT32(sgt->sgl->dma_address, sgt->sgl->dma_length,

				dir, client->secure);

				dir, client->secure, flags);

	}



	if (!(flags & MSM_BO_EXTBUF))

msm/sde/sde_crtc.c

+2 −5
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static void _sde_crtc_blend_setup_mixer(struct drm_crtc *crtc, 
	uint32_t stage_idx, lm_idx, layout_idx;

	int zpos_cnt[MAX_LAYOUTS_PER_CRTC][SDE_STAGE_MAX + 1];

	int i, mode, cnt = 0;

	bool bg_alpha_enable = false, is_secure = false;

	bool bg_alpha_enable = false;

	u32 blend_type;

	DECLARE_BITMAP(fetch_active, SSPP_MAX);
@@ -1454,9 +1454,6 @@ static void _sde_crtc_blend_setup_mixer(struct drm_crtc *crtc, 


		mode = sde_plane_get_property(pstate,

				PLANE_PROP_FB_TRANSLATION_MODE);

		is_secure = ((mode == SDE_DRM_FB_SEC) ||

				(mode == SDE_DRM_FB_SEC_DIR_TRANS)) ?

				true : false;



		set_bit(sde_plane_pipe(plane), fetch_active);

		sde_plane_ctl_flush(plane, ctl, true);
@@ -1488,7 +1485,7 @@ static void _sde_crtc_blend_setup_mixer(struct drm_crtc *crtc, 
					state->src_w >> 16, state->src_h >> 16,

					state->crtc_x, state->crtc_y,

					state->crtc_w, state->crtc_h,

					pstate->rotation, is_secure);

					pstate->rotation, mode);



			/*

			 * none or left layout will program to layer mixer

msm/sde/sde_encoder.c

+6 −3
Original line number Diff line number Diff line
@@ -994,7 +994,9 @@ static int sde_encoder_virt_atomic_check( 
	}



	drm_mode_set_crtcinfo(adj_mode, 0);

	SDE_EVT32(DRMID(drm_enc), adj_mode->flags, adj_mode->private_flags);

	SDE_EVT32(DRMID(drm_enc), adj_mode->flags, adj_mode->private_flags,

		 old_top, adj_mode->vrefresh, adj_mode->hdisplay,

		 adj_mode->vdisplay, adj_mode->htotal, adj_mode->vtotal);



	return ret;

}
@@ -1307,8 +1309,6 @@ static int _sde_encoder_update_rsc_client( 
			rsc_state = SDE_RSC_CLK_STATE;

	}



	SDE_EVT32(rsc_state, qsync_mode);



	is_vid_mode = sde_encoder_check_curr_mode(&sde_enc->base,

				MSM_DISPLAY_VIDEO_MODE);

	mode = &sde_enc->crtc->state->mode;
@@ -1339,6 +1339,9 @@ static int _sde_encoder_update_rsc_client( 
		sde_enc->rsc_state_init = false;

	}



	SDE_EVT32(DRMID(drm_enc), rsc_state, qsync_mode,

				 rsc_config->fps, sde_enc->rsc_state_init);



	if (rsc_state != SDE_RSC_IDLE_STATE && !sde_enc->rsc_state_init

			&& (disp_info->display_type == SDE_CONNECTOR_PRIMARY)) {

		/* update it only once */

msm/sde/sde_encoder_phys_cmd.c

+7 −2
Original line number Diff line number Diff line
@@ -174,12 +174,14 @@ static void sde_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx) 
{

	struct sde_encoder_phys *phys_enc = arg;

	struct sde_encoder_phys_cmd *cmd_enc;

	u32 event = 0;

	struct sde_hw_ctl *ctl;

	u32 scheduler_status = INVALID_CTL_STATUS, event = 0;



	if (!phys_enc || !phys_enc->hw_pp)

		return;



	cmd_enc = to_sde_encoder_phys_cmd(phys_enc);

	ctl = phys_enc->hw_ctl;



	SDE_ATRACE_BEGIN("pp_done_irq");
@@ -196,8 +198,11 @@ static void sde_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx) 
		spin_unlock(phys_enc->enc_spinlock);

	}



	if (ctl && ctl->ops.get_scheduler_status)

		scheduler_status = ctl->ops.get_scheduler_status(ctl);



	SDE_EVT32_IRQ(DRMID(phys_enc->parent),

			phys_enc->hw_pp->idx - PINGPONG_0, event);

			phys_enc->hw_pp->idx - PINGPONG_0, event, scheduler_status);



	/* Signal any waiting atomic commit thread */

	wake_up_all(&phys_enc->pending_kickoff_wq);