UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ander Conselvan de Oliveira 2015-05-29 14:28:09 +03:00 committed by Jani Nikula
parent 4ed9fb371c
commit 9044a81d1b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/i915/intel_display.c
View File

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