瀏覽代碼

disp: msm: sde: propagate the error code in dual display TUI cases

Propagate error in case the number of active displays is greater
than 1, in dual display scenario to fail the validate.

Change-Id: I04250af8d7a6b0c290132abbaed2ed8e5e311a4f
Signed-off-by: Raviteja Tamatam <[email protected]>
Raviteja Tamatam 2 年之前
父節點
當前提交
26c011089e
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      msm/sde/sde_crtc.c
  2. 1 0
      msm/sde/sde_kms.c

+ 1 - 1
msm/sde/sde_crtc.c

@@ -3284,7 +3284,7 @@ void sde_crtc_complete_commit(struct drm_crtc *crtc,
 
 	for (i = 0; i < MAX_DSI_DISPLAYS; i++) {
 		splash_display = &sde_kms->splash_data.splash_display[i];
-		if (splash_display->cont_splash_enabled &&
+		if (splash_display->cont_splash_enabled && splash_display->encoder &&
 				crtc == splash_display->encoder->crtc)
 			cont_splash_enabled = true;
 	}

+ 1 - 0
msm/sde/sde_kms.c

@@ -5342,6 +5342,7 @@ int sde_kms_vm_trusted_resource_init(struct sde_kms *sde_kms,
 	if (sde_kms->splash_data.num_splash_displays != 1) {
 		SDE_ERROR("no. of displays not supported:%d\n",
 				sde_kms->splash_data.num_splash_displays);
+		ret = -EINVAL;
 		goto error;
 	}