浏览代码

Merge "disp: msm: sde: check for null topology in dither setup path"

qctecmdr 4 年之前
父节点
当前提交
5100a8e9e9
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      msm/sde/sde_encoder.c

+ 3 - 2
msm/sde/sde_encoder.c

@@ -2550,8 +2550,9 @@ static void _sde_encoder_setup_dither(struct sde_encoder_phys *phys)
 		return;
 
 	topology = sde_connector_get_topology_name(phys->connector);
-	if ((topology == SDE_RM_TOPOLOGY_PPSPLIT) &&
-			(phys->split_role == ENC_ROLE_SLAVE))
+	if ((topology == SDE_RM_TOPOLOGY_NONE) ||
+			((topology == SDE_RM_TOPOLOGY_PPSPLIT) &&
+			(phys->split_role == ENC_ROLE_SLAVE)))
 		return;
 
 	drm_enc = phys->parent;