Commit 7b89b8de authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/i915: Remove some unneeded checks from check_crtc_state.

This is handled by the atomic core now, no need to check this for ourself.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 35dd3c64
...@@ -12784,8 +12784,7 @@ check_crtc_state(struct drm_device *dev) ...@@ -12784,8 +12784,7 @@ check_crtc_state(struct drm_device *dev)
struct intel_crtc_state pipe_config; struct intel_crtc_state pipe_config;
for_each_intel_crtc(dev, crtc) { for_each_intel_crtc(dev, crtc) {
bool enabled = false; bool active;
bool active = false;
memset(&pipe_config, 0, sizeof(pipe_config)); memset(&pipe_config, 0, sizeof(pipe_config));
...@@ -12795,22 +12794,6 @@ check_crtc_state(struct drm_device *dev) ...@@ -12795,22 +12794,6 @@ check_crtc_state(struct drm_device *dev)
I915_STATE_WARN(crtc->active && !crtc->base.state->enable, I915_STATE_WARN(crtc->active && !crtc->base.state->enable,
"active crtc, but not enabled in sw tracking\n"); "active crtc, but not enabled in sw tracking\n");
for_each_intel_encoder(dev, encoder) {
if (encoder->base.crtc != &crtc->base)
continue;
enabled = true;
if (encoder->connectors_active)
active = true;
}
I915_STATE_WARN(active != crtc->active,
"crtc's computed active state doesn't match tracked active state "
"(expected %i, found %i)\n", active, crtc->active);
I915_STATE_WARN(enabled != crtc->base.state->enable,
"crtc's computed enabled state doesn't match tracked enabled state "
"(expected %i, found %i)\n", enabled,
crtc->base.state->enable);
active = dev_priv->display.get_pipe_config(crtc, active = dev_priv->display.get_pipe_config(crtc,
&pipe_config); &pipe_config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment