@@ -8765,9 +8765,9 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
plane_config->size = fb->pitches[0] * aligned_height;
- DRM_DEBUG_KMS("pipe/plane %c/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
+ DRM_DEBUG_KMS("pipe/plane %c/%d with fb: size=%dx%d@%d, base=%x, offset=%x, pitch=%d, size=0x%x\n",
pipe_name(pipe), plane, fb->width, fb->height,
- fb->bits_per_pixel, base, fb->pitches[0],
+ fb->bits_per_pixel, base, offset, fb->pitches[0],
plane_config->size);
plane_config->fb = intel_fb;
@@ -9789,9 +9789,9 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
plane_config->size = fb->pitches[0] * aligned_height;
- DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
+ DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, base=%x, offset=%x, pitch=%d, size=0x%x\n",
pipe_name(pipe), fb->width, fb->height,
- fb->bits_per_pixel, base, fb->pitches[0],
+ fb->bits_per_pixel, base, offset, fb->pitches[0],
plane_config->size);
plane_config->fb = intel_fb;
@@ -9886,9 +9886,9 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
plane_config->size = fb->pitches[0] * aligned_height;
- DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
+ DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, base=%x, offset=%x, pitch=%d, size=0x%x\n",
pipe_name(pipe), fb->width, fb->height,
- fb->bits_per_pixel, base, fb->pitches[0],
+ fb->bits_per_pixel, base, offset, fb->pitches[0],
plane_config->size);
plane_config->fb = intel_fb;
We go through all the trouble of reading the offset from hw, but never end up using it. Later in the DRM_DEBUG_KMS statement we mistakenly use the base as the offset. Let's fix this by now making use of both the offset and the base, and while we are here make the format more consistent. Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)