From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> The atomic code needs intel_modeset_update_staged_output_state(). Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 451cc3d..c84a839 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7423,7 +7423,7 @@ static bool intel_encoder_crtc_ok(struct drm_encoder *encoder, * Updates the staged output configuration state, e.g. after we've read out the * current hw state. */ -static void intel_modeset_update_staged_output_state(struct drm_device *dev) +void intel_modeset_update_staged_output_state(struct drm_device *dev) { struct intel_encoder *encoder; struct intel_connector *connector; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1230c1b..24dc192 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -737,4 +737,6 @@ extern void intel_disable_primary(struct drm_crtc *crtc); extern void intel_crtc_attach_properties(struct drm_crtc *crtc); extern void intel_crtc_update_properties(struct drm_crtc *crtc); +extern void intel_modeset_update_staged_output_state(struct drm_device *dev); + #endif /* __INTEL_DRV_H__ */ -- 1.7.8.6 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel