From 4ad201445b499735ff815b47b9a698fd20f6f47a Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Mon, 6 Feb 2017 19:56:59 -0800 Subject: [PATCH] drm/msm/sde:: fix optional property parsing for qseed and csc properties With commit <5aad7456b5a5aeea93a437ae46680a97d089fe51> (), support for CSC is added to 8998 target. However this is an optional property for some targets. Fix the parsing logic to not fail in case of missing optional properties. CRs-Fixed: 2002381 Change-Id: Idfe750d3afbd0d88d89ffa873deae130a24b2827 Signed-off-by: Abhinav Kumar Signed-off-by: Manoj Kumar AVM --- drivers/gpu/drm/msm/sde/sde_hw_catalog.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c index 31a6d985c38f..519288f0dda2 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c @@ -1830,12 +1830,20 @@ static int sde_parse_dt(struct device_node *np, struct sde_mdss_cfg *cfg) cfg->qseed_type = SDE_SSPP_SCALER_QSEED3; else if (!rc && !strcmp(type, "qseedv2")) cfg->qseed_type = SDE_SSPP_SCALER_QSEED2; + else if (rc) { + SDE_DEBUG("qseed property not found\n"); + rc = 0; + } rc = of_property_read_string(np, sde_prop[CSC_TYPE].prop_name, &type); if (!rc && !strcmp(type, "csc")) cfg->csc_type = SDE_SSPP_CSC; else if (!rc && !strcmp(type, "csc-10bit")) cfg->csc_type = SDE_SSPP_CSC_10BIT; + else if (rc) { + SDE_DEBUG("CSC property not found\n"); + rc = 0; + } cfg->has_src_split = PROP_VALUE_ACCESS(prop_value, SRC_SPLIT, 0); end: