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

Commit 36d0a82e authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

drm/i915: Remove unnecessary goto in intel_primary_plane_disable() 



The same logic can be implemented without it, and it even saves a line
of code.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 35a57ffb

drivers/gpu/drm/i915/intel_display.c

+4 −6
Original line number Diff line number Diff line
@@ -11850,13 +11850,11 @@ intel_primary_plane_disable(struct drm_plane *plane) 
	 * In either case, we need to unpin the FB and let the fb pointer get

	 * updated, but otherwise we don't need to touch the hardware.

	 */

	if (!intel_crtc->primary_enabled)

		goto disable_unpin;



	if (intel_crtc->primary_enabled) {

		intel_crtc_wait_for_pending_flips(plane->crtc);

		intel_disable_primary_hw_plane(plane, plane->crtc);

	}



disable_unpin:

	mutex_lock(&dev->struct_mutex);

	i915_gem_track_fb(intel_fb_obj(plane->fb), NULL,

			  INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe));