[Intel-gfx] [PATCH] drm/i915: Set best_encoder field of connector_state also when disabling

Ander Conselvan de Oliveira ander.conselvan.de.oliveira at intel.com
Tue Mar 31 01:35:00 PDT 2015


The best_encoder field of connector_state wasn't properly set when a
connector was being disabled, leading to an incosistent atomic state.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a693129..307c43b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12009,6 +12009,7 @@ intel_modeset_stage_output_state(struct drm_device *dev,
 				connector->encoder = connector->new_encoder;
 		} else {
 			connector_state->crtc = NULL;
+			connector_state->best_encoder = NULL;
 		}
 	}
 	for_each_intel_crtc(dev, crtc) {
-- 
2.1.0



More information about the Intel-gfx mailing list