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

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

Merge "disp: msm: sde: fix logging in crtc and kms"

parents d37cbd37 5fb59a73

msm/sde/sde_crtc.c

+4 −3
Original line number Diff line number Diff line
@@ -5398,8 +5398,8 @@ static int _sde_debugfs_status_show(struct seq_file *s, void *data) 
		if (!pstate || !state)

			continue;



		seq_printf(s, "\tplane:%u stage:%d\n", plane->base.id,

			pstate->stage);

		seq_printf(s, "\tplane:%u stage:%d rotation:%d\n",

			plane->base.id, pstate->stage, pstate->rotation);



		if (plane->state->fb) {

			fb = plane->state->fb;
@@ -5429,7 +5429,8 @@ static int _sde_debugfs_status_show(struct seq_file *s, void *data) 
		}



		seq_printf(s, "\tsrc_x:%4d src_y:%4d src_w:%4d src_h:%4d\n",

			state->src_x, state->src_y, state->src_w, state->src_h);

			state->src_x >> 16, state->src_y >> 16,

			state->src_w >> 16, state->src_h >> 16);



		seq_printf(s, "\tdst x:%4d dst_y:%4d dst_w:%4d dst_h:%4d\n",

			state->crtc_x, state->crtc_y, state->crtc_w,

msm/sde/sde_kms.c

+3 −2
Original line number Diff line number Diff line
@@ -881,11 +881,12 @@ static void _sde_kms_release_splash_resource(struct sde_kms *sde_kms, 


	priv = sde_kms->dev->dev_private;



	SDE_EVT32(crtc->base.id, crtc->state->active,

			sde_kms->splash_data.num_splash_displays);

	if (!crtc->state->active || !sde_kms->splash_data.num_splash_displays)

		return;



	SDE_EVT32(DRMID(crtc), crtc->state->active,

			sde_kms->splash_data.num_splash_displays);



	for (i = 0; i < MAX_DSI_DISPLAYS; i++) {

		splash_display = &sde_kms->splash_data.splash_display[i];

		if (splash_display->encoder &&