Commit ce8e3942 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-intel-next-fixes-2015-06-22' of...

Merge tag 'drm-intel-next-fixes-2015-06-22' of git://anongit.freedesktop.org/drm-intel into drm-next

fix warning introduced in last -fixes
* tag 'drm-intel-next-fixes-2015-06-22' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Silence compiler warning
parents 8ffaa903 9044a81d
......@@ -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;
}
}
}
......
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