From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Switch the plane debugs to use DRM_RECT_FMT & co. instead
of drm_rect_debug_print() so that the debugs go on the same line.

Reviewed-by: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_atomic_plane.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c 
b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 651f81ed85ab..3a474652abaa 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -944,9 +944,9 @@ int intel_atomic_plane_check_clipping(struct 
intel_plane_state *plane_state,
        hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
        vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
        if (hscale < 0 || vscale < 0) {
-               drm_dbg_kms(&i915->drm, "Invalid scaling of plane\n");
-               drm_rect_debug_print("src: ", src, true);
-               drm_rect_debug_print("dst: ", dst, false);
+               drm_dbg_kms(&i915->drm,
+                           "Invalid scaling of plane " DRM_RECT_FP_FMT " -> " 
DRM_RECT_FMT "\n",
+                           DRM_RECT_FP_ARG(src), DRM_RECT_ARG(dst));
                return -ERANGE;
        }
 
@@ -960,9 +960,8 @@ int intel_atomic_plane_check_clipping(struct 
intel_plane_state *plane_state,
 
        if (!can_position && plane_state->uapi.visible &&
            !drm_rect_equals(dst, clip)) {
-               drm_dbg_kms(&i915->drm, "Plane must cover entire CRTC\n");
-               drm_rect_debug_print("dst: ", dst, false);
-               drm_rect_debug_print("clip: ", clip, false);
+               drm_dbg_kms(&i915->drm, "Plane (" DRM_RECT_FMT ") must cover 
entire CRTC (" DRM_RECT_FMT ")\n",
+                           DRM_RECT_ARG(dst), DRM_RECT_ARG(clip));
                return -EINVAL;
        }
 
-- 
2.45.3

Reply via email to