From fb72c8faa8e5bdffd57915c66b99d3f7b4e689d3 Mon Sep 17 00:00:00 2001 From: santosh Date: Thu, 28 May 2020 15:33:54 -0700 Subject: [PATCH] disp: msm: sde: add vig formats before qseed and csc initializations Setup vig pipe makes an early return if csc and qseed are not supported. This change moves addition of vig formats before intializing qseed and csc. Change-Id: I2eb651f7bbd81757a9de23501fda51a510d0e673 Signed-off-by: santosh --- msm/sde/sde_hw_catalog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msm/sde/sde_hw_catalog.c b/msm/sde/sde_hw_catalog.c index 5a788c9988cb..db2df82aa212 100644 --- a/msm/sde/sde_hw_catalog.c +++ b/msm/sde/sde_hw_catalog.c @@ -1434,6 +1434,9 @@ static int _sde_sspp_setup_vigs(struct device_node *np, set_bit(SDE_PERF_SSPP_QOS_8LVL, &sspp->perf_features); vig_count++; + sblk->format_list = sde_cfg->vig_formats; + sblk->virt_format_list = sde_cfg->virt_vig_formats; + if ((sde_cfg->qseed_type == SDE_SSPP_SCALER_QSEED2) || (sde_cfg->qseed_type == SDE_SSPP_SCALER_QSEED3) || (sde_cfg->qseed_type == SDE_SSPP_SCALER_QSEED3LITE)) { @@ -1449,9 +1452,6 @@ static int _sde_sspp_setup_vigs(struct device_node *np, _sde_sspp_setup_vigs_pp(props, sde_cfg, sspp); - sblk->format_list = sde_cfg->vig_formats; - sblk->virt_format_list = sde_cfg->virt_vig_formats; - if (sde_cfg->true_inline_rot_rev > 0) { set_bit(SDE_SSPP_TRUE_INLINE_ROT, &sspp->features); sblk->in_rot_format_list = sde_cfg->inline_rot_formats;