drm/atomic: Use drm_framebuffer_print_info()

Use drm_framebuffer_print_info() to print framebuffer info in
drm_atomic_plane_print_state(). This will give optional GEM info as well.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171107191348.17555-6-noralf@tronnes.org

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index fd96c3dad2fbdff318760a93b78699abfb0b4dc2..bf8ca515c958805229aca848978c0dbc016b3cae 100644 (file)
--- 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)
 {
@@ -935,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);