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

Commit e450c230 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: Change error log to info when device suspend"

parents a927dd02 cbbefd73

drivers/gpu/drm/msm/sde/sde_color_processing.c

+1 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ int sde_cp_crtc_set_property(struct drm_crtc *crtc, 
	 */

	if (!sde_crtc->num_mixers ||

	    sde_crtc->num_mixers > ARRAY_SIZE(sde_crtc->mixers)) {

		DRM_ERROR("Invalid mixer config act cnt %d max cnt %ld\n",

		DRM_INFO("Invalid mixer config act cnt %d max cnt %ld\n",

			sde_crtc->num_mixers, ARRAY_SIZE(sde_crtc->mixers));

		ret = -EPERM;

		goto exit;

drivers/gpu/drm/msm/sde/sde_crtc.c

+11 −4
Original line number Diff line number Diff line
@@ -5276,12 +5276,19 @@ static int sde_crtc_atomic_set_property(struct drm_crtc *crtc, 
	}



exit:

	if (ret)

		SDE_ERROR("%s: failed to set property%d %s: %d\n", crtc->name,

				DRMID(property), property->name, ret);

	if (ret) {

		if (ret != -EPERM)

			SDE_ERROR("%s: failed to set property%d %s: %d\n",

				crtc->name, DRMID(property),

				property->name, ret);

		else

			SDE_DEBUG("%s: failed to set property%d %s: %d\n",

				crtc->name, DRMID(property),

				property->name, ret);

	} else {

		SDE_DEBUG("%s: %s[%d] <= 0x%llx\n", crtc->name, property->name,

				property->base.id, val);

	}



	return ret;

}