From: Sean Paul Date: Fri, 16 Nov 2018 18:42:31 +0000 (-0500) Subject: drm/msm: dpu: Don't bother checking ->enabled in dpu_crtc_vblank X-Git-Tag: v5.0-rc1~185^2~1^2~14 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5c6277c1d25b5fbb1555f7962ce0d72f78fea266;p=users%2Fjedix%2Flinux-maple.git drm/msm: dpu: Don't bother checking ->enabled in dpu_crtc_vblank 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 Signed-off-by: Sean Paul Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index a403002d5e8e..558f9abb1a99 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -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);