Merge remote branch 'airlied/drm-core-next' into drm-intel-next

			      struct drm_framebuffer *old_fb)

{

	struct drm_device *dev = crtc->dev;

	struct drm_display_mode *adjusted_mode, saved_mode;

	struct drm_display_mode *adjusted_mode, saved_mode, saved_hwmode;

	struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;

	struct drm_encoder_helper_funcs *encoder_funcs;

	int saved_x, saved_y;

	if (!crtc->enabled)

		return true;

	saved_hwmode = crtc->hwmode;

	saved_mode = crtc->mode;

	saved_x = crtc->x;

	saved_y = crtc->y;

	}

	/* Store real post-adjustment hardware mode. */

	crtc->hwmode = *adjusted_mode;

	/* Calculate and store various constants which

	 * are later needed by vblank and swap-completion

	 * timestamping. They are derived from true hwmode.

	 */

	drm_calc_timestamping_constants(crtc);

	/* XXX free adjustedmode */

	drm_mode_destroy(dev, adjusted_mode);

	/* FIXME: add subpixel order */

done:

	if (!ret) {

		crtc->hwmode = saved_hwmode;

		crtc->mode = saved_mode;

		crtc->x = saved_x;

		crtc->y = saved_y;