samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: remove check to commit RM resourses"

Browse Source
This commit is contained in:
qctecmdr
2021-04-27 06:11:35 -07:00
committed by Gerrit - the friendly Code Review server
parent a698dbe5aa c233dee598
commit b0ea2d882f
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
msm/sde/sde_encoder.c
View File

@@ -2503,20 +2503,12 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
if (ret) if (ret)
return; return;
if (drm_enc->crtc->state->active_changed ||
!(msm_is_mode_seamless_dms(msm_mode) ||
(msm_is_mode_seamless_dyn_clk(msm_mode) &&
sde_encoder_check_curr_mode(drm_enc, MSM_DISPLAY_CMD_MODE)))) {
/* reserve dynamic resources now, indicating non test-only */ /* reserve dynamic resources now, indicating non test-only */
ret = sde_rm_reserve(&sde_kms->rm, drm_enc, drm_enc->crtc->state, ret = sde_rm_reserve(&sde_kms->rm, drm_enc, drm_enc->crtc->state, conn->state, false);
conn->state, false);
if (ret) { if (ret) {
SDE_ERROR_ENC(sde_enc, SDE_ERROR_ENC(sde_enc, "failed to reserve hw resources, %d\n", ret);
"failed to reserve hw resources, %d\n", ret);
return; return;
} }
}
/* assign the reserved HW blocks to this encoder */ /* assign the reserved HW blocks to this encoder */
_sde_encoder_virt_populate_hw_res(drm_enc); _sde_encoder_virt_populate_hw_res(drm_enc);