Merge tag 'drm-misc-next-2021-03-03' of git://anongit.freedesktop.org/drm/drm-misc...

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 8d7aaa6..25fed00 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10228,7 +10228,6 @@ static void intel_dump_plane_state(const struct intel_plane_state *plane_state)
        struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
        struct drm_i915_private *i915 = to_i915(plane->base.dev);
        const struct drm_framebuffer *fb = plane_state->hw.fb;
-       struct drm_format_name_buf format_name;
 
        if (!fb) {
                drm_dbg_kms(&i915->drm,
@@ -10239,10 +10238,9 @@ static void intel_dump_plane_state(const struct intel_plane_state *plane_state)
        }
 
        drm_dbg_kms(&i915->drm,
-                   "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %s modifier = 0x%llx, visible: %s\n",
+                   "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %p4cc modifier = 0x%llx, visible: %s\n",
                    plane->base.base.id, plane->base.name,
-                   fb->base.id, fb->width, fb->height,
-                   drm_get_format_name(fb->format->format, &format_name),
+                   fb->base.id, fb->width, fb->height, &fb->format->format,
                    fb->modifier, yesno(plane_state->uapi.visible));
        drm_dbg_kms(&i915->drm, "\trotation: 0x%x, scaler: %d\n",
                    plane_state->hw.rotation, plane_state->scaler_id);
@@ -14236,13 +14234,9 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
        if (!drm_any_plane_has_format(&dev_priv->drm,
                                      mode_cmd->pixel_format,
                                      mode_cmd->modifier[0])) {
-               struct drm_format_name_buf format_name;
-
                drm_dbg_kms(&dev_priv->drm,
-                           "unsupported pixel format %s / modifier 0x%llx\n",
-                           drm_get_format_name(mode_cmd->pixel_format,
-                                               &format_name),
-                           mode_cmd->modifier[0]);
+                           "unsupported pixel format %p4cc / modifier 0x%llx\n",
+                           &mode_cmd->pixel_format, mode_cmd->modifier[0]);
                goto err;
        }