Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50637aa7 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Enable support for nonblocking modeset 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1478609742-13603-12-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> #irc
parent 4302055b

drivers/gpu/drm/i915/intel_display.c

+0 −9
Original line number Diff line number Diff line
@@ -14548,10 +14548,6 @@ static void intel_atomic_track_fbs(struct drm_atomic_state *state) 
 * This function commits a top-level state object that has been validated

 * with drm_atomic_helper_check().

 *

 * FIXME:  Atomic modeset support for i915 is not yet complete.  At the moment

 * nonblocking commits are only safe for pure plane updates. Everything else

 * should work though.

 *

 * RETURNS

 * Zero for success or -errno.

 */
@@ -14563,11 +14559,6 @@ static int intel_atomic_commit(struct drm_device *dev, 
	struct drm_i915_private *dev_priv = to_i915(dev);

	int ret = 0;



	if (intel_state->modeset && nonblock) {

		DRM_DEBUG_KMS("nonblocking commit for modeset not yet implemented.\n");

		return -EINVAL;

	}



	ret = drm_atomic_helper_setup_commit(state, nonblock);

	if (ret)

		return ret;