Browse Source

disp: msm: add feature-enabled check for output hw-fence sw-override

In the case that the hw-fence feature is enabled in the display driver dt
but disabled during initialization by the display driver when hw-fence
driver dependency is disabled, the existing check to determine
if the function pointer is available is not sufficient to determine
if the feature is enabled. This change adds an additional check to ensure
we do not set the output-fences sw-override unless hw-fencing is enabled.

Change-Id: I7f5000037e7b2a142224ef9c45b383e5c701350a
Signed-off-by: Christina Oliveira <[email protected]>
Christina Oliveira 2 years ago
parent
commit
85b87f5573
1 changed files with 2 additions and 1 deletions
  1. 2 1
      msm/sde/sde_encoder_phys_cmd.c

+ 2 - 1
msm/sde/sde_encoder_phys_cmd.c

@@ -442,7 +442,8 @@ static void _sde_encoder_phys_signal_frame_done(struct sde_encoder_phys *phys_en
 	 * sw must trigger the override to force the signal here
 	 */
 	if (phys_enc->autorefresh_disable_trans) {
-		if (ctl->ops.trigger_output_fence_override)
+		if (phys_enc->sde_kms && phys_enc->sde_kms->catalog->hw_fence_rev &&
+				ctl->ops.trigger_output_fence_override)
 			ctl->ops.trigger_output_fence_override(ctl);
 		phys_enc->autorefresh_disable_trans = false;
 	}