Commit 712ec5de authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner
Browse files

drm/rockchip: vop2: Don't spam logs in atomic update 



Demote the error message to drm_dbg_kms to only print the message
if the respective debug messages are enabled.

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241028074140.382199-1-andyshrk@163.com
parent 666e1960

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

+12 −10
Original line number Diff line number Diff line
@@ -1271,7 +1271,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, 
	dsp_w = drm_rect_width(dest);



	if (dest->x1 + dsp_w > adjusted_mode->hdisplay) {

		drm_err(vop2->drm, "vp%d %s dest->x1[%d] + dsp_w[%d] exceed mode hdisplay[%d]\n",

		drm_dbg_kms(vop2->drm,

			    "vp%d %s dest->x1[%d] + dsp_w[%d] exceed mode hdisplay[%d]\n",

			    vp->id, win->data->name, dest->x1, dsp_w, adjusted_mode->hdisplay);

		dsp_w = adjusted_mode->hdisplay - dest->x1;

		if (dsp_w < 4)
@@ -1282,7 +1283,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, 
	dsp_h = drm_rect_height(dest);



	if (dest->y1 + dsp_h > adjusted_mode->vdisplay) {

		drm_err(vop2->drm, "vp%d %s dest->y1[%d] + dsp_h[%d] exceed mode vdisplay[%d]\n",

		drm_dbg_kms(vop2->drm,

			    "vp%d %s dest->y1[%d] + dsp_h[%d] exceed mode vdisplay[%d]\n",

			    vp->id, win->data->name, dest->y1, dsp_h, adjusted_mode->vdisplay);

		dsp_h = adjusted_mode->vdisplay - dest->y1;

		if (dsp_h < 4)
@@ -1296,14 +1298,14 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, 
	 */

	if (!(win->data->feature & WIN_FEATURE_AFBDC)) {

		if (actual_w > dsp_w && (actual_w & 0xf) == 1) {

			drm_err(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n",

			drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n",

				    vp->id, win->data->name, actual_w);

			actual_w -= 1;

		}

	}



	if (afbc_en && actual_w % 4) {

		drm_err(vop2->drm, "vp%d %s actual_w[%d] not 4 pixel aligned\n",

		drm_dbg_kms(vop2->drm, "vp%d %s actual_w[%d] not 4 pixel aligned\n",

			    vp->id, win->data->name, actual_w);

		actual_w = ALIGN_DOWN(actual_w, 4);

	}
@@ -1341,7 +1343,7 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, 
		 */

		stride = (fb->pitches[0] << 3) / bpp;

		if ((stride & 0x3f) && (xmirror || rotate_90 || rotate_270))

			drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",

			drm_dbg_kms(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",

				    vp->id, win->data->name, stride);



		uv_swap = vop2_afbc_uv_swap(fb->format->format);