diff options
| author | Ander Conselvan de Oliveira | 2014-11-27 14:32:34 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-12-03 09:35:28 +0100 |
| commit | 36d0a82ef4dbe8a586b1ca538cbd37c889829340 (patch) | |
| tree | 3a59cc02f58c4f54ab84ce8133c47fe9d4258840 /drivers/gpu/drm | |
| parent | drm/i915: Only init engines once (diff) | |
| download | kernel-qcow2-linux-36d0a82ef4dbe8a586b1ca538cbd37c889829340.tar.gz kernel-qcow2-linux-36d0a82ef4dbe8a586b1ca538cbd37c889829340.tar.xz kernel-qcow2-linux-36d0a82ef4dbe8a586b1ca538cbd37c889829340.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 376ec890c8fa..3a088c03d7b9 100644 --- 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)); |