Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / i915_debugfs.c

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b00c828..b654b74 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -173,26 +173,30 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
                                break;
 
                        case I915_GGTT_VIEW_ROTATED:
-                               seq_printf(m, ", rotated [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]",
+                               seq_printf(m, ", rotated [(%ux%u, src_stride=%u, dst_stride=%u, offset=%u), (%ux%u, src_stride=%u, dst_stride=%u, offset=%u)]",
                                           vma->ggtt_view.rotated.plane[0].width,
                                           vma->ggtt_view.rotated.plane[0].height,
-                                          vma->ggtt_view.rotated.plane[0].stride,
+                                          vma->ggtt_view.rotated.plane[0].src_stride,
+                                          vma->ggtt_view.rotated.plane[0].dst_stride,
                                           vma->ggtt_view.rotated.plane[0].offset,
                                           vma->ggtt_view.rotated.plane[1].width,
                                           vma->ggtt_view.rotated.plane[1].height,
-                                          vma->ggtt_view.rotated.plane[1].stride,
+                                          vma->ggtt_view.rotated.plane[1].src_stride,
+                                          vma->ggtt_view.rotated.plane[1].dst_stride,
                                           vma->ggtt_view.rotated.plane[1].offset);
                                break;
 
                        case I915_GGTT_VIEW_REMAPPED:
-                               seq_printf(m, ", remapped [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]",
+                               seq_printf(m, ", remapped [(%ux%u, src_stride=%u, dst_stride=%u, offset=%u), (%ux%u, src_stride=%u, dst_stride=%u, offset=%u)]",
                                           vma->ggtt_view.remapped.plane[0].width,
                                           vma->ggtt_view.remapped.plane[0].height,
-                                          vma->ggtt_view.remapped.plane[0].stride,
+                                          vma->ggtt_view.remapped.plane[0].src_stride,
+                                          vma->ggtt_view.remapped.plane[0].dst_stride,
                                           vma->ggtt_view.remapped.plane[0].offset,
                                           vma->ggtt_view.remapped.plane[1].width,
                                           vma->ggtt_view.remapped.plane[1].height,
-                                          vma->ggtt_view.remapped.plane[1].stride,
+                                          vma->ggtt_view.remapped.plane[1].src_stride,
+                                          vma->ggtt_view.remapped.plane[1].dst_stride,
                                           vma->ggtt_view.remapped.plane[1].offset);
                                break;