Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cbf0e72 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: sde: reduce log level for import attach NULL cases"

parents 92a9a522 7f63176a

msm/msm_fb.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

	}

msm/sde/sde_plane.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

	}