anierin/display-drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 48fb12268c on remote branch

Browse Source 
Change-Id: Ic84c1e7fac51488c00858a4a25b39143ec6085ba
This commit is contained in:
Linux Build Service Account
2023-04-04 04:54:30 -07:00
parent c5f6aecbbf 48fb12268c
commit 145f965b5e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/dsi/dsi_panel.c
View File

@@ -1108,13 +1108,13 @@ static int dsi_panel_parse_triggers(struct dsi_host_common_cfg *host,
} else if (!strcmp(trig, "trigger_sw_te")) {
host->dma_cmd_trigger = DSI_TRIGGER_SW_TE;
} else {
DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
DSI_ERR("[%s] Unrecognized cmd dma trigger type (%s)\n",
name, trig);
rc = -EINVAL;
}
} else {
DSI_DEBUG("[%s] Falling back to default MDP trigger\n", name);
DSI_DEBUG("[%s] Falling back to default cmd dma trigger\n", name);
host->dma_cmd_trigger = DSI_TRIGGER_SW;
}

3
msm/sde/sde_encoder.c
View File

@@ -3323,7 +3323,8 @@ static void sde_encoder_wait_for_vsync_event_complete(struct sde_encoder_virt *s
if (!ret) {
SDE_ERROR("vsync event complete timed out %d\n", ret);
SDE_EVT32(ret, SDE_EVTLOG_ERROR);
for (i = 0; i < sde_enc->num_phys_encs; i++) {
for (i = 0; (i < sde_enc->num_phys_encs &&
i < ARRAY_SIZE(sde_enc->phys_encs)) ; i++) {
struct sde_encoder_phys *phys = sde_enc->phys_encs[i];
if (phys && phys->ops.control_vblank_irq)