diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2020-09-10 17:04:42 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2020-09-10 17:06:49 +0300 |
| commit | a68a3fdeaede39046754e789a97758219a1d0697 (patch) | |
| tree | 842955e4c219e09b4355187152962794e80914be | |
| parent | 910f5286baa2361f12280e26b5a3a5cc24e76743 (diff) | |
drm: msm: dpu1: do not depend on not supported features
DPU1 does not support merge_3d, so do not try using 2 LMs for larger
resolutions. This fixes 1080p display on RB5.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index a97f6d2e5a08..5c04f0361b90 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -555,10 +555,12 @@ static struct msm_display_topology dpu_encoder_get_topology( */ if (intf_count == 2) topology.num_lm = 2; - else if (!dpu_kms->catalog->caps->has_3d_merge) - topology.num_lm = 1; - else +#if 0 + else if (dpu_kms->catalog->caps->has_3d_merge) topology.num_lm = (mode->hdisplay > MAX_HDISPLAY_SPLIT) ? 2 : 1; +#endif + else + topology.num_lm = 1; if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { if (dpu_kms->catalog->dspp && |