diff options
| author | Drew Davenport <ddavenport@chromium.org> | 2019-12-07 00:13:44 +0100 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2020-01-03 01:09:15 +0100 |
| commit | 1caaf257fa145e3d24f05aff6fe06df5c5358591 (patch) | |
| tree | 28c0fafe155d74305778b6b878ee2c79dc27b0b8 /drivers/gpu/drm/msm | |
| parent | drm/msm/dpu: Remove unnecessary NULL checks (diff) | |
| download | linux-1caaf257fa145e3d24f05aff6fe06df5c5358591.tar.xz linux-1caaf257fa145e3d24f05aff6fe06df5c5358591.zip | |
drm/msm/dpu: Remove unnecessary NULL checks
dpu_crtc_mixer.lm_ctl will never be NULL, so don't bother checking
Signed-off-by: Drew Davenport <ddavenport@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index f197dce54576..b9ed8285ab39 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -197,8 +197,8 @@ static void _dpu_crtc_blend_setup(struct drm_crtc *crtc) DPU_DEBUG("%s\n", dpu_crtc->name); for (i = 0; i < cstate->num_mixers; i++) { - if (!mixer[i].hw_lm || !mixer[i].lm_ctl) { - DPU_ERROR("invalid lm or ctl assigned to mixer\n"); + if (!mixer[i].hw_lm) { + DPU_ERROR("invalid lm assigned to mixer\n"); return; } mixer[i].mixer_op_mode = 0; @@ -1115,8 +1115,6 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) m = &cstate->mixers[i]; if (!m->hw_lm) seq_printf(s, "\tmixer[%d] has no lm\n", i); - else if (!m->lm_ctl) - seq_printf(s, "\tmixer[%d] has no ctl\n", i); else seq_printf(s, "\tmixer:%d ctl:%d width:%d height:%d\n", m->hw_lm->idx - LM_0, m->lm_ctl->idx - CTL_0, |