diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-17 07:33:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-17 07:33:03 -0800 |
| commit | c82e967d8a4e2fd0cd9676a4190a3bf6f05a32f2 (patch) | |
| tree | f412e33e94519d42220f457f849f25d1ce22bd74 /drivers | |
| parent | 3fea30d6d9b335076f3ef3d2b2dd85d8d3d12a12 (diff) | |
| parent | 4ad201445b499735ff815b47b9a698fd20f6f47a (diff) | |
Merge "drm/msm/sde:: fix optional property parsing for qseed and csc properties"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_catalog.c | 8 |
1 files changed, 8 insertions, 0 deletions
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: |