OSDN Git Service

drm/msm: dpu: Don't bother checking ->enabled in dpu_crtc_vblank
authorSean Paul <seanpaul@chromium.org>
Fri, 16 Nov 2018 18:42:31 +0000 (13:42 -0500)
committerRob Clark <robdclark@gmail.com>
Tue, 11 Dec 2018 18:10:14 +0000 (13:10 -0500)
The drm_crtc_vblank_on/off calls in enable/disable guarantee that we
won't call this function when crtc is not enabled.

Changes in v2:
- None

Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

index a403002..558f9ab 100644 (file)
@@ -1189,9 +1189,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
 
        mutex_lock(&dpu_crtc->crtc_lock);
        trace_dpu_crtc_vblank(DRMID(&dpu_crtc->base), en, dpu_crtc);
-       if (dpu_crtc->enabled) {
-               _dpu_crtc_vblank_enable_no_lock(dpu_crtc, en);
-       }
+       _dpu_crtc_vblank_enable_no_lock(dpu_crtc, en);
        dpu_crtc->vblank_requested = en;
        mutex_unlock(&dpu_crtc->crtc_lock);