提交 f9bab55e 编写于 作者: M Maarten Lankhorst

drm/i915: Remove bogus ips_enabled check.

The flag just tells us IPS can be enabled, if the primary plane
is not enabled it means IPS might not be. This never triggered
in CI because we don't have a haswell ULT there, but can be
reproduced easily with kms_atomic_transitions.plane-all-modeset-transition
Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171110113503.16253-2-maarten.lankhorst@linux.intel.com
[mlankhorst: Remove from haswell_get_pipe_config too. (danvet)]
Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 1b790cd9
...@@ -9233,10 +9233,6 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc, ...@@ -9233,10 +9233,6 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
ironlake_get_pfit_config(crtc, pipe_config); ironlake_get_pfit_config(crtc, pipe_config);
} }
if (IS_HASWELL(dev_priv))
pipe_config->ips_enabled = hsw_crtc_supports_ips(crtc) &&
(I915_READ(IPS_CTL) & IPS_ENABLE);
if (pipe_config->cpu_transcoder != TRANSCODER_EDP && if (pipe_config->cpu_transcoder != TRANSCODER_EDP &&
!transcoder_is_dsi(pipe_config->cpu_transcoder)) { !transcoder_is_dsi(pipe_config->cpu_transcoder)) {
pipe_config->pixel_multiplier = pipe_config->pixel_multiplier =
...@@ -11259,10 +11255,6 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, ...@@ -11259,10 +11255,6 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,
PIPE_CONF_CHECK_CLOCK_FUZZY(pixel_rate); PIPE_CONF_CHECK_CLOCK_FUZZY(pixel_rate);
} }
/* BDW+ don't expose a synchronous way to read the state */
if (IS_HASWELL(dev_priv))
PIPE_CONF_CHECK_I(ips_enabled);
PIPE_CONF_CHECK_I(double_wide); PIPE_CONF_CHECK_I(double_wide);
PIPE_CONF_CHECK_P(shared_dpll); PIPE_CONF_CHECK_P(shared_dpll);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册