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) ...@@ -11867,15 +11867,15 @@ intel_modeset_update_state(struct drm_atomic_state *state)
if (!intel_encoder->base.crtc) if (!intel_encoder->base.crtc)
continue; continue;
for_each_crtc_in_state(state, crtc, crtc_state, i) for_each_crtc_in_state(state, crtc, crtc_state, i) {
if (crtc == intel_encoder->base.crtc) if (crtc != intel_encoder->base.crtc)
break; continue;
if (crtc != intel_encoder->base.crtc) if (crtc_state->enable && needs_modeset(crtc_state))
continue; intel_encoder->connectors_active = false;
if (crtc_state->enable && needs_modeset(crtc_state)) break;
intel_encoder->connectors_active = false; }
} }
drm_atomic_helper_swap_state(state->dev, state); drm_atomic_helper_swap_state(state->dev, state);
...@@ -11890,24 +11890,24 @@ intel_modeset_update_state(struct drm_atomic_state *state) ...@@ -11890,24 +11890,24 @@ intel_modeset_update_state(struct drm_atomic_state *state)
if (!connector->encoder || !connector->encoder->crtc) if (!connector->encoder || !connector->encoder->crtc)
continue; continue;
for_each_crtc_in_state(state, crtc, crtc_state, i) for_each_crtc_in_state(state, crtc, crtc_state, i) {
if (crtc == connector->encoder->crtc) if (crtc != connector->encoder->crtc)
break; continue;
if (crtc != connector->encoder->crtc) if (crtc->state->enable && needs_modeset(crtc->state)) {
continue; struct drm_property *dpms_property =
dev->mode_config.dpms_property;
if (crtc->state->enable && needs_modeset(crtc->state)) { connector->dpms = DRM_MODE_DPMS_ON;
struct drm_property *dpms_property = drm_object_property_set_value(&connector->base,
dev->mode_config.dpms_property; dpms_property,
DRM_MODE_DPMS_ON);
connector->dpms = DRM_MODE_DPMS_ON; intel_encoder = to_intel_encoder(connector->encoder);
drm_object_property_set_value(&connector->base, intel_encoder->connectors_active = true;
dpms_property, }
DRM_MODE_DPMS_ON);
intel_encoder = to_intel_encoder(connector->encoder); break;
intel_encoder->connectors_active = true;
} }
} }
......
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