drm/sti: update fps debugfs entries

This update allows to have a clearer fps log trace by adding information
about plane size and plane pixel format.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>

diff --git a/drivers/gpu/drm/sti/sti_plane.c b/drivers/gpu/drm/sti/sti_plane.c
index ca4b371..699094c 100644 (file)
--- a/drivers/gpu/drm/sti/sti_plane.c
+++ b/drivers/gpu/drm/sti/sti_plane.c
@@ -65,9 +65,18 @@ void sti_plane_update_fps(struct sti_plane *plane,
 
        fps->last_timestamp = now;
        fps->last_frame_counter = fps->curr_frame_counter;
-       fpks = (num_frames * 1000000) / ms_since_last;
-       snprintf(plane->fps_info.fps_str, FPS_LENGTH, "%-6s @ %d.%.3d fps",
-                sti_plane_to_str(plane), fpks / 1000, fpks % 1000);
+
+       if (plane->drm_plane.fb) {
+               fpks = (num_frames * 1000000) / ms_since_last;
+               snprintf(plane->fps_info.fps_str, FPS_LENGTH,
+                        "%-8s %4dx%-4d %.4s @ %3d.%-3.3d fps (%s)",
+                        plane->drm_plane.name,
+                        plane->drm_plane.fb->width,
+                        plane->drm_plane.fb->height,
+                        (char *)&plane->drm_plane.fb->pixel_format,
+                        fpks / 1000, fpks % 1000,
+                        sti_plane_to_str(plane));
+       }
 
        if (fps->curr_field_counter) {
                /* Compute number of field updates */
@@ -75,7 +84,7 @@ void sti_plane_update_fps(struct sti_plane *plane,
                fps->last_field_counter = fps->curr_field_counter;
                fipks = (num_fields * 1000000) / ms_since_last;
                snprintf(plane->fps_info.fips_str,
-                        FPS_LENGTH, " - %d.%.3d field/sec",
+                        FPS_LENGTH, " - %3d.%-3.3d field/sec",
                         fipks / 1000, fipks % 1000);
        } else {
                plane->fps_info.fips_str[0] = '\0';

diff --git a/drivers/gpu/drm/sti/sti_plane.h b/drivers/gpu/drm/sti/sti_plane.h
index ce3e8d6..c36c13f 100644 (file)
--- a/drivers/gpu/drm/sti/sti_plane.h
+++ b/drivers/gpu/drm/sti/sti_plane.h
@@ -48,7 +48,7 @@ enum sti_plane_status {
        STI_PLANE_DISABLED,
 };
 
-#define FPS_LENGTH 64
+#define FPS_LENGTH 128
 struct sti_fps_info {
        bool output;
        unsigned int curr_frame_counter;