drm: Print the fb dimensions when the src coord check fails

When debugging bad plane source coordinates it helps to have an
idea of what the framebuffer dimensions are.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171101183533.28466-1-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 8ec7d7bade8a34862d79b4877d0747a8f396b8d4..fd96c3dad2fbdff318760a93b78699abfb0b4dc2 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -907,11 +907,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;
        }
 

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index af279844d7ceb69d44ec9bf260ea63d9435b6de4..40e6565105acb66973f910ac9cb497daae8550b3 100644 (file)
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -78,11 +78,12 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y,
            src_h > fb_height ||
            src_y > fb_height - src_h) {
                DRM_DEBUG_KMS("Invalid source coordinates "
-                             "%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",
+                             "%u.%06ux%u.%06u+%u.%06u+%u.%06u (fb %ux%u)\n",
                              src_w >> 16, ((src_w & 0xffff) * 15625) >> 10,
                              src_h >> 16, ((src_h & 0xffff) * 15625) >> 10,
                              src_x >> 16, ((src_x & 0xffff) * 15625) >> 10,
-                             src_y >> 16, ((src_y & 0xffff) * 15625) >> 10);
+                             src_y >> 16, ((src_y & 0xffff) * 15625) >> 10,
+                             fb->width, fb->height);
                return -ENOSPC;
        }