Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_display.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_drm.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c
index 007311c21fdaa0462b05d53cd8a2aad0269b1727,9adec630f224997edd251da9e33d5e8ea0f32557..4d75529c0e858160761f5eb55db65e5d7565c27b
--- 1/drivers/gpu/drm/msm/dsi/dsi_host.c
--- 2/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@@ -1827,11 -1831,18 +1831,18 @@@ static int dsi_host_parse_dt(struct msm
                        __func__, ret);
                goto err;
        }
-       if (!ret)
+       if (!ret) {
                msm_dsi->te_source = devm_kstrdup(dev, te_source, GFP_KERNEL);
+               if (!msm_dsi->te_source) {
+                       DRM_DEV_ERROR(dev, "%s: failed to allocate te_source\n",
+                               __func__);
+                       ret = -ENOMEM;
+                       goto err;
+               }
+       }
        ret = 0;
  
 -      if (of_property_read_bool(np, "syscon-sfpb")) {
 +      if (of_property_present(np, "syscon-sfpb")) {
                msm_host->sfpb = syscon_regmap_lookup_by_phandle(np,
                                        "syscon-sfpb");
                if (IS_ERR(msm_host->sfpb)) {

diff --cc drivers/gpu/drm/msm/msm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_kms.c
Simple merge