Commit 9044a81d authored May 29, 2015 by Ander Conselvan de Oliveira Committed by Jani Nikula Jun 22, 2015

drm/i915: Silence compiler warning



Silence the following -Wmaybe-uninitialized warnings and make the code
more clear.

drivers/gpu/drm/i915/intel_display.c: In function ‘__intel_set_mode’:
drivers/gpu/drm/i915/intel_display.c:11844:14: warning: ‘crtc_state’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  return state->mode_changed || state->active_changed;
              ^
drivers/gpu/drm/i915/intel_display.c:11854:25: note: ‘crtc_state’ was declared here
  struct drm_crtc_state *crtc_state;
                         ^
drivers/gpu/drm/i915/intel_display.c:11868:6: warning: ‘crtc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
   if (crtc != intel_encoder->base.crtc)
      ^
drivers/gpu/drm/i915/intel_display.c:11853:19: note: ‘crtc’ was declared here
  struct drm_crtc *crtc;

Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent 4ed9fb37

drivers/gpu/drm/i915/intel_display.c

+21 −21

Original line number	Diff line number	Diff line
		@@ -11867,15 +11867,15 @@ intel_modeset_update_state(struct drm_atomic_state *state)
		if (!intel_encoder->base.crtc)
		continue;

		for_each_crtc_in_state(state, crtc, crtc_state, i)
		if (crtc == intel_encoder->base.crtc)
		break;

		for_each_crtc_in_state(state, crtc, crtc_state, i) {
		if (crtc != intel_encoder->base.crtc)
		continue;

		if (crtc_state->enable && needs_modeset(crtc_state))
		intel_encoder->connectors_active = false;

		break;
		}
		}

		drm_atomic_helper_swap_state(state->dev, state);
		@@ -11890,10 +11890,7 @@ intel_modeset_update_state(struct drm_atomic_state *state)
		if (!connector->encoder \|\| !connector->encoder->crtc)
		continue;

		for_each_crtc_in_state(state, crtc, crtc_state, i)
		if (crtc == connector->encoder->crtc)
		break;

		for_each_crtc_in_state(state, crtc, crtc_state, i) {
		if (crtc != connector->encoder->crtc)
		continue;

		@@ -11909,6 +11906,9 @@ intel_modeset_update_state(struct drm_atomic_state *state)
		intel_encoder = to_intel_encoder(connector->encoder);
		intel_encoder->connectors_active = true;
		}

		break;
		}
		}

		}