drm/msm/dpu: Remove unnecessary NULL checks
authorDrew Davenport <ddavenport@chromium.org>
Fri, 6 Dec 2019 23:13:45 +0000 (16:13 -0700)
committerRob Clark <robdclark@chromium.org>
Fri, 3 Jan 2020 00:09:15 +0000 (16:09 -0800)
dpu_crtc_mixer.hw_lm will never be NULL, so don't check.

Signed-off-by: Drew Davenport <ddavenport@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

index b9ed828..bf51341 100644 (file)
@@ -197,10 +197,6 @@ 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) {
-                       DPU_ERROR("invalid lm assigned to mixer\n");
-                       return;
-               }
                mixer[i].mixer_op_mode = 0;
                mixer[i].flush_mask = 0;
                if (mixer[i].lm_ctl->ops.clear_all_blendstages)
@@ -1113,12 +1109,9 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
 
        for (i = 0; i < cstate->num_mixers; ++i) {
                m = &cstate->mixers[i];
-               if (!m->hw_lm)
-                       seq_printf(s, "\tmixer[%d] has no lm\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,
-                               out_width, mode->vdisplay);
+               seq_printf(s, "\tmixer:%d ctl:%d width:%d height:%d\n",
+                       m->hw_lm->idx - LM_0, m->lm_ctl->idx - CTL_0,
+                       out_width, mode->vdisplay);
        }
 
        seq_puts(s, "\n");