1 files changed, 7 insertions, 18 deletions

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index c2da5585e201..37445d50816a 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -33,6 +33,7 @@
 #include <linux/sync_file.h>
 
 #include "drm_crtc_internal.h"
+#include "drm_internal.h"
 
 void __drm_crtc_commit_free(struct kref *kref)
 {
@@ -907,11 +908,12 @@ static int drm_atomic_plane_check(struct drm_plane *plane,
             state->src_h > fb_height ||
             state->src_y > fb_height - state->src_h) {
                 DRM_DEBUG_ATOMIC("Invalid source coordinates "
-                                 "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",
+                                 "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",
                                  state->src_w >> 16, ((state->src_w & 0xffff) * 15625) >> 10,
                                  state->src_h >> 16, ((state->src_h & 0xffff) * 15625) >> 10,
                                  state->src_x >> 16, ((state->src_x & 0xffff) * 15625) >> 10,
-                                 state->src_y >> 16, ((state->src_y & 0xffff) * 15625) >> 10);
+                                 state->src_y >> 16, ((state->src_y & 0xffff) * 15625) >> 10,
+                                 state->fb->width, state->fb->height);
                 return -ENOSPC;
         }
 
@@ -934,21 +936,8 @@ static void drm_atomic_plane_print_state(struct drm_printer *p,
         drm_printf(p, "plane[%u]: %s\n", plane->base.id, plane->name);
         drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)");
         drm_printf(p, "\tfb=%u\n", state->fb ? state->fb->base.id : 0);
-        if (state->fb) {
-                struct drm_framebuffer *fb = state->fb;
-                int i, n = fb->format->num_planes;
-                struct drm_format_name_buf format_name;
-
-                drm_printf(p, "\t\tformat=%s\n",
-                              drm_get_format_name(fb->format->format, &format_name));
-                drm_printf(p, "\t\t\tmodifier=0x%llx\n", fb->modifier);
-                drm_printf(p, "\t\tsize=%dx%d\n", fb->width, fb->height);
-                drm_printf(p, "\t\tlayers:\n");
-                for (i = 0; i < n; i++) {
-                        drm_printf(p, "\t\t\tpitch[%d]=%u\n", i, fb->pitches[i]);
-                        drm_printf(p, "\t\t\toffset[%d]=%u\n", i, fb->offsets[i]);
-                }
-        }
+        if (state->fb)
+                drm_framebuffer_print_info(p, 2, state->fb);
         drm_printf(p, "\tcrtc-pos=" DRM_RECT_FMT "\n", DRM_RECT_ARG(&dest));
         drm_printf(p, "\tsrc-pos=" DRM_RECT_FP_FMT "\n", DRM_RECT_FP_ARG(&src));
         drm_printf(p, "\trotation=%x\n", state->rotation);
@@ -1808,7 +1797,7 @@ int drm_atomic_debugfs_init(struct drm_minor *minor)
 #endif
 
 /*
- * The big monstor ioctl
+ * The big monster ioctl
  */
 
 static struct drm_pending_vblank_event *create_vblank_event(