UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2015-08-05 12:37:03 +02:00 committed by Daniel Vetter
parent 35dd3c6450
commit 7b89b8de4e
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/intel_display.c
View File

@ -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)
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);