drm/i915: Remove unnecessary goto in intel_primary_plane_disable()
Subsystems (2)
PATCH 1/1 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.
--- drivers/gpu/drm/i915/intel_display.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -6
@@ -11803,13 +11803,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));
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Remove unnecessary goto in
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1 365/366 366/366
SNB 450/450 450/450 IVB 498/498 498/498 BYT 289/289 289/289 HSW 564/564 564/564 BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(1, M26)PASS(2, M26M37) PASS(1, M37)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 4 lines · Ander Conselvan de Oliveira
The same logic can be implemented without it, and it even saves a line of code.
Signed-off-by Ander Conselvan de Oliveira <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx