drm/i915: Unconditionally check gmch pfit state

Now that we recompute the pipe config for all CRTCs that have changed
we don't have problems with stale configuration data for the global
pfit and can remove this hack. Yay!

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ede6528..c29e7ed 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12607,21 +12607,11 @@ intel_pipe_config_compare(struct drm_device *dev,
        PIPE_CONF_CHECK_I(pipe_src_w);
        PIPE_CONF_CHECK_I(pipe_src_h);
 
-       /*
-        * FIXME: BIOS likes to set up a cloned config with lvds+external
-        * screen. Since we don't yet re-compute the pipe config when moving
-        * just the lvds port away to another pipe the sw tracking won't match.
-        *
-        * Proper atomic modesets with recomputed global state will fix this.
-        * Until then just don't check gmch state for inherited modes.
-        */
-       if (!PIPE_CONF_QUIRK(PIPE_CONFIG_QUIRK_INHERITED_MODE)) {
-               PIPE_CONF_CHECK_I(gmch_pfit.control);
-               /* pfit ratios are autocomputed by the hw on gen4+ */
-               if (INTEL_INFO(dev)->gen < 4)
-                       PIPE_CONF_CHECK_I(gmch_pfit.pgm_ratios);
-               PIPE_CONF_CHECK_I(gmch_pfit.lvds_border_bits);
-       }
+       PIPE_CONF_CHECK_I(gmch_pfit.control);
+       /* pfit ratios are autocomputed by the hw on gen4+ */
+       if (INTEL_INFO(dev)->gen < 4)
+               PIPE_CONF_CHECK_I(gmch_pfit.pgm_ratios);
+       PIPE_CONF_CHECK_I(gmch_pfit.lvds_border_bits);
 
        PIPE_CONF_CHECK_I(pch_pfit.enabled);
        if (current_config->pch_pfit.enabled) {