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

Commit 94f598f1 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/i915: remove !enabled handling from commit primary plane step 



The !crtc->enabled case will now be handled by the !visible code,
since the handling is basically the same.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2363d8c9

drivers/gpu/drm/i915/intel_display.c

+0 −26
Original line number Diff line number Diff line
@@ -11838,32 +11838,6 @@ intel_commit_primary_plane(struct drm_plane *plane, 
	struct drm_rect *src = &state->src;

	int ret;



	/*

	 * If the CRTC isn't enabled, we're just pinning the framebuffer,

	 * updating the fb pointer, and returning without touching the

	 * hardware.  This allows us to later do a drmModeSetCrtc with fb=-1 to

	 * turn on the display with all planes setup as desired.

	 */

	if (!crtc->enabled) {

		mutex_lock(&dev->struct_mutex);



		/*

		 * If we already called setplane while the crtc was disabled,

		 * we may have an fb pinned; unpin it.

		 */

		if (plane->fb)

			intel_unpin_fb_obj(old_obj);



		i915_gem_track_fb(old_obj, obj,

				  INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe));



		/* Pin and return without programming hardware */

		ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);

		mutex_unlock(&dev->struct_mutex);



		return ret;

	}



	intel_crtc_wait_for_pending_flips(crtc);



	/*