[Intel-gfx] [PATCH 3/3] drm/i915: Factor out a function disabling fused-off display

[Imre Deak]

Factor out a function used both on older and new platforms to disable
the display functionality if the display is fused-off.

Signed-off-by: Imre Deak <imre.deak at intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 34 +++++++++++++-----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 044ac552c9280..9d6d1fad9f1d9 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -369,6 +369,21 @@ void intel_device_info_runtime_init_early(struct drm_i915_private *i915)
 	intel_device_info_subplatform_init(i915);
 }
 
+static void disable_fused_off_display(struct drm_i915_private *i915)
+{
+	struct intel_runtime_info *runtime = RUNTIME_INFO(i915);
+
+	drm_info(&i915->drm, "Display fused off, disabling\n");
+
+	runtime->pipe_mask = 0;
+	runtime->cpu_transcoder_mask = 0;
+	runtime->fbc_mask = 0;
+	runtime->has_hdcp = 0;
+	runtime->fbc_mask = 0;
+	runtime->has_dmc = 0;
+	runtime->has_dsc = 0;
+}
+
 /**
  * intel_device_info_runtime_init - initialize runtime info
  * @dev_priv: the i915 device
@@ -454,11 +469,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 		    sfuse_strap & SFUSE_STRAP_DISPLAY_DISABLED ||
 		    (HAS_PCH_CPT(dev_priv) &&
 		     !(sfuse_strap & SFUSE_STRAP_FUSE_LOCK))) {
-			drm_info(&dev_priv->drm,
-				 "Display fused off, disabling\n");
-			runtime->pipe_mask = 0;
-			runtime->cpu_transcoder_mask = 0;
-			runtime->fbc_mask = 0;
+			disable_fused_off_display(dev_priv);
 		} else if (fuse_strap & IVB_PIPE_C_DISABLE) {
 			drm_info(&dev_priv->drm, "PipeC fused off\n");
 			runtime->pipe_mask &= ~BIT(PIPE_C);
@@ -502,17 +513,8 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 	}
 
 	if ((IS_DGFX(dev_priv) || DISPLAY_VER(dev_priv) >= 14) &&
-	    !(intel_de_read(dev_priv, GU_CNTL_PROTECTED) & DEPRESENT)) {
-		drm_info(&dev_priv->drm, "Display fused off, disabling\n");
-
-		runtime->pipe_mask = 0;
-		runtime->cpu_transcoder_mask = 0;
-		runtime->fbc_mask = 0;
-		runtime->has_hdcp = 0;
-		runtime->fbc_mask = 0;
-		runtime->has_dmc = 0;
-		runtime->has_dsc = 0;
-	}
+	    !(intel_de_read(dev_priv, GU_CNTL_PROTECTED) & DEPRESENT))
+		disable_fused_off_display(dev_priv);
 
 	if (GRAPHICS_VER(dev_priv) == 6 && i915_vtd_active(dev_priv)) {
 		drm_info(&dev_priv->drm,
-- 
2.37.1