samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

Merge "disp: msm: sde: dynamic lm reservation for secondary disp"

瀏覽代碼
This commit is contained in:
qctecmdr
2019-05-31 16:20:33 -07:00
committed by Gerrit - the friendly Code Review server
父節點 f0d4d74c9e 52855c704a
當前提交 b84d2c5ad0
共有 10 個文件被更改，包括 100 次插入 和 45 次删除
Download Patch File Download Diff File Expand all files Collapse all files

17
msm/sde/sde_rm.c
查看文件

@@ -797,7 +797,8 @@ static bool _sde_rm_check_lm_and_get_connected_blks(
*dspp = NULL;
*ds = NULL;
*pp = NULL;
display_pref = lm_cfg->features & BIT(SDE_DISP_PRIMARY_PREF);
display_pref = lm_cfg->features & BIT(SDE_DISP_PRIMARY_PREF) ||
lm_cfg->features & BIT(SDE_DISP_SECONDARY_PREF);
cwb_pref = lm_cfg->features & BIT(SDE_DISP_CWB_PREF);
SDE_DEBUG("check lm %d: dspp %d ds %d pp %d disp_pref: %d cwb_pref%d\n",
@@ -832,10 +833,10 @@ static bool _sde_rm_check_lm_and_get_connected_blks(
SDE_DEBUG("fail: cwb supported lm not allocated\n");
return false;
}
} else if (!(reqs->hw_res.is_primary && display_pref)) {
} else if (!(reqs->hw_res.display_type && display_pref)) {
SDE_DEBUG(
"display preference is not met. is_primary: %d display_pref: %d\n",
(int)reqs->hw_res.is_primary, (int)display_pref);
"display preference is not met. display_type: %d display_pref: %d\n",
(int)reqs->hw_res.display_type, (int)display_pref);
return false;
}
@@ -1028,11 +1029,11 @@ static int _sde_rm_reserve_ctls(
if (top->top_name == SDE_RM_TOPOLOGY_PPSPLIT &&
!has_ppsplit)
continue;
} else if (!(reqs->hw_res.is_primary && primary_pref) &&
!_ctl_ids) {
} else if (!(reqs->hw_res.display_type ==
SDE_CONNECTOR_PRIMARY && primary_pref) && !_ctl_ids) {
SDE_DEBUG(
"display pref not met. is_primary: %d primary_pref: %d\n",
reqs->hw_res.is_primary, primary_pref);
"display pref not met. display_type: %d primary_pref: %d\n",
reqs->hw_res.display_type, primary_pref);
continue;
}