]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Enable non-contiguous pipe fusing
authorAnshuman Gupta <anshuman.gupta@intel.com>
Wed, 18 Mar 2020 09:44:48 +0000 (15:14 +0530)
committerUma Shankar <uma.shankar@intel.com>
Wed, 18 Mar 2020 10:43:28 +0000 (16:13 +0530)
As we have already enabled supported infrastructure for
non-contiguous pipe fusing in driver, we don't require non-contiguous
pipe_mask check anymore.
It is an unlike condition, it make sense to remove this condition.

changes since RFC:
- using intel_pipe_mask_is_valid() function to check integrity of
  pipe_mask. [Ville]
v2:
- simplify condition in intel_pipe_mask_is_valid(). [Ville]
v3:
- removed non-contiguous pipe fusing check. [Lucas]

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200318094448.26239-1-anshuman.gupta@intel.com
drivers/gpu/drm/i915/intel_device_info.c

index d7fe12734db889eb0f9708fc949c7e1283d8cff8..9ff89e142ff1aa635a2f1cbf622cc0dee500b784 100644 (file)
@@ -998,17 +998,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
                    (dfsm & TGL_DFSM_PIPE_D_DISABLE))
                        enabled_mask &= ~BIT(PIPE_D);
 
-               /*
-                * At least one pipe should be enabled and if there are
-                * disabled pipes, they should be the last ones, with no holes
-                * in the mask.
-                */
-               if (enabled_mask == 0 || !is_power_of_2(enabled_mask + 1))
-                       drm_err(&dev_priv->drm,
-                               "invalid pipe fuse configuration: enabled_mask=0x%x\n",
-                               enabled_mask);
-               else
-                       info->pipe_mask = enabled_mask;
+               info->pipe_mask = enabled_mask;
 
                if (dfsm & SKL_DFSM_DISPLAY_HDCP_DISABLE)
                        info->display.has_hdcp = 0;