diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-11-05 06:56:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-11-05 06:56:47 -0800 |
| commit | 1cbf0e72acf5de55941f1838162f06251bae7232 (patch) | |
| tree | 64387e8ca1ef7eccca4f24c235f779f1920b8178 | |
| parent | 92a9a5223ccaf64a56df9fa9e61f43f187d2ae90 (diff) | |
| parent | 7f63176a2abf0d561f87befeaf3f05014df7ab5e (diff) | |
| download | display-drivers-1cbf0e72acf5de55941f1838162f06251bae7232.tar.gz | |
Merge "disp: msm: sde: reduce log level for import attach NULL cases"
| -rw-r--r-- | msm/msm_fb.c | 4 | ||||
| -rw-r--r-- | msm/sde/sde_plane.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/msm/msm_fb.c b/msm/msm_fb.c index 1129636e..6b7b34ad 100644 --- a/msm/msm_fb.c +++ b/msm/msm_fb.c @@ -533,10 +533,12 @@ int msm_fb_obj_get_attrs(struct drm_gem_object *obj, int *fb_ns, int *fb_sec, int *fb_sec_dir, unsigned long *flags) { + struct msm_gem_object *msm_obj = to_msm_bo(obj); int ret = 0; if (!obj->import_attach) { - DRM_ERROR("NULL attachment in drm gem object\n"); + DRM_DEBUG("NULL attachment in gem object flags: 0x%x\n", + msm_obj->flags); return -EINVAL; } diff --git a/msm/sde/sde_plane.c b/msm/sde/sde_plane.c index 455d62b3..6b2341ba 100644 --- a/msm/sde/sde_plane.c +++ b/msm/sde/sde_plane.c @@ -2581,9 +2581,9 @@ static int _sde_plane_validate_fb(struct sde_plane *psde, ret = msm_fb_obj_get_attrs(fb->obj[i], &fb_ns, &fb_sec, &fb_sec_dir, &flags); - if ((fb_ns && (mode != SDE_DRM_FB_NON_SEC)) || + if (!ret && ((fb_ns && (mode != SDE_DRM_FB_NON_SEC)) || (fb_sec && (mode != SDE_DRM_FB_SEC)) || - (fb_sec_dir && (mode != SDE_DRM_FB_SEC_DIR_TRANS))) { + (fb_sec_dir && (mode != SDE_DRM_FB_SEC_DIR_TRANS)))) { SDE_ERROR_PLANE(psde, "mode:%d fb:%d flag:0x%x rc:%d\n", mode, fb->base.id, flags, ret); SDE_EVT32(psde->base.base.id, fb->base.id, flags, @@ -4601,7 +4601,8 @@ struct drm_plane *sde_plane_init(struct drm_device *dev, SDE_ERROR("[%u]SSPP init failed\n", pipe); ret = PTR_ERR(psde->pipe_hw); goto clean_plane; - } else if (!psde->pipe_hw->cap || !psde->pipe_hw->cap->sblk) { + } else if (!psde->pipe_hw || !psde->pipe_hw->cap || + !psde->pipe_hw->cap->sblk) { SDE_ERROR("[%u]SSPP init returned invalid cfg\n", pipe); goto clean_sspp; } |