[Intel-gfx] [PATCH] drm/i915: Handle error to get connector state when staging config

Ander Conselvan de Oliveira ander.conselvan.de.oliveira at intel.com
Fri Mar 27 06:33:51 PDT 2015


The return value of one of the calls to drm_atomic_get_connector_state()
in intel_modeset_stage_output_state() wasn't checked for errors.

Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 68fe8b8..1329ed2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12000,6 +12000,8 @@ intel_modeset_stage_output_state(struct drm_device *dev,
 	for_each_intel_connector(dev, connector) {
 		connector_state =
 			drm_atomic_get_connector_state(state, &connector->base);
+		if (IS_ERR(connector_state))
+			return PTR_ERR(connector_state);
 
 		if (connector->new_encoder) {
 			if (connector->new_encoder != connector->encoder)
-- 
2.1.0



More information about the Intel-gfx mailing list