Skip to content

Commit b55f91a

Browse files
johnstultz-workrobclark
authored andcommitted
drm: msm: Quiet down plane errors in atomic_check
With the db845c running AOSP, I see the following error on every frame on the home screen: [drm:dpu_plane_atomic_check:915] [dpu error]plane33 invalid src 2880x1620+0+470 line:2560 This is due to the error paths in atomic_check using DPU_ERROR_PLANE(), and the drm_hwcomposer using atomic_check to decide how to composite the frame (thus it expects to see atomic_check to fail). In order to avoid spamming the logs, this patch converts the DPU_ERROR_PLANE() calls to DPU_DEBUG_PLANE() calls in atomic_check. Cc: Todd Kjos <[email protected]> Cc: Alistair Delva <[email protected]> Cc: Amit Pundir <[email protected]> Cc: Rob Clark <[email protected]> Cc: Sean Paul <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: John Stultz <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent e3ff688 commit b55f91a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
871871
pdpu->pipe_sblk->maxupscale << 16,
872872
true, true);
873873
if (ret) {
874-
DPU_ERROR_PLANE(pdpu, "Check plane state failed (%d)\n", ret);
874+
DPU_DEBUG_PLANE(pdpu, "Check plane state failed (%d)\n", ret);
875875
return ret;
876876
}
877877
if (!state->visible)
@@ -897,13 +897,13 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
897897
(!(pdpu->features & DPU_SSPP_SCALER) ||
898898
!(pdpu->features & (BIT(DPU_SSPP_CSC)
899899
| BIT(DPU_SSPP_CSC_10BIT))))) {
900-
DPU_ERROR_PLANE(pdpu,
900+
DPU_DEBUG_PLANE(pdpu,
901901
"plane doesn't have scaler/csc for yuv\n");
902902
return -EINVAL;
903903

904904
/* check src bounds */
905905
} else if (!dpu_plane_validate_src(&src, &fb_rect, min_src_size)) {
906-
DPU_ERROR_PLANE(pdpu, "invalid source " DRM_RECT_FMT "\n",
906+
DPU_DEBUG_PLANE(pdpu, "invalid source " DRM_RECT_FMT "\n",
907907
DRM_RECT_ARG(&src));
908908
return -E2BIG;
909909

@@ -912,19 +912,19 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
912912
(src.x1 & 0x1 || src.y1 & 0x1 ||
913913
drm_rect_width(&src) & 0x1 ||
914914
drm_rect_height(&src) & 0x1)) {
915-
DPU_ERROR_PLANE(pdpu, "invalid yuv source " DRM_RECT_FMT "\n",
915+
DPU_DEBUG_PLANE(pdpu, "invalid yuv source " DRM_RECT_FMT "\n",
916916
DRM_RECT_ARG(&src));
917917
return -EINVAL;
918918

919919
/* min dst support */
920920
} else if (drm_rect_width(&dst) < 0x1 || drm_rect_height(&dst) < 0x1) {
921-
DPU_ERROR_PLANE(pdpu, "invalid dest rect " DRM_RECT_FMT "\n",
921+
DPU_DEBUG_PLANE(pdpu, "invalid dest rect " DRM_RECT_FMT "\n",
922922
DRM_RECT_ARG(&dst));
923923
return -EINVAL;
924924

925925
/* check decimated source width */
926926
} else if (drm_rect_width(&src) > max_linewidth) {
927-
DPU_ERROR_PLANE(pdpu, "invalid src " DRM_RECT_FMT " line:%u\n",
927+
DPU_DEBUG_PLANE(pdpu, "invalid src " DRM_RECT_FMT " line:%u\n",
928928
DRM_RECT_ARG(&src), max_linewidth);
929929
return -E2BIG;
930930
}

0 commit comments

Comments
 (0)