diff options
| author | Drew Davenport <ddavenport@chromium.org> | 2019-12-06 16:13:45 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2020-01-02 16:09:15 -0800 |
| commit | 85a8f8eec8f0481a9d5e84ef85b99e7d399b801b (patch) | |
| tree | 8d09c8381a936d422130218f3d9a8f24aadba382 /drivers/gpu/drm/msm/disp | |
| parent | 1caaf257fa145e3d24f05aff6fe06df5c5358591 (diff) | |
| download | linux-stable-85a8f8eec8f0481a9d5e84ef85b99e7d399b801b.tar.gz linux-stable-85a8f8eec8f0481a9d5e84ef85b99e7d399b801b.tar.bz2 linux-stable-85a8f8eec8f0481a9d5e84ef85b99e7d399b801b.zip | |
drm/msm/dpu: Remove unnecessary NULL checks
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>
Diffstat (limited to 'drivers/gpu/drm/msm/disp')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index b9ed8285ab39..bf513411b243 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -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"); |