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: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 376ec890c8fac278d0495cbfa16c86bd7e028ff4..3a088c03d7b9ae988ede013f9ef7eb1b1fcf3cfa 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
-
-       intel_crtc_wait_for_pending_flips(plane->crtc);
-       intel_disable_primary_hw_plane(plane, plane->crtc);
+       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));