lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qctecmdr 2019-05-23 18:17:37 -07:00 committed by Gerrit - the friendly Code Review server
commit 15959feb73
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
msm/sde/sde_crtc.c
View File

@ -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,

5
msm/sde/sde_kms.c
View File

@ -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 &&