drm: make drm_get_format_name thread-safe

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
[danvet: Clarify that the returned pointer must be freed with
kfree().]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index e06d1f5334cf..98288d87c2ce 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -143,6 +143,7 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
                 crtc_state->base.enable ? crtc_state->pipe_src_h : 0;
 
         if (state->fb && intel_rotation_90_or_270(state->rotation)) {
+                const char *format_name;
                 if (!(state->fb->modifier[0] == I915_FORMAT_MOD_Y_TILED ||
                         state->fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED)) {
                         DRM_DEBUG_KMS("Y/Yf tiling required for 90/270!\n");
@@ -157,8 +158,9 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
                 switch (state->fb->pixel_format) {
                 case DRM_FORMAT_C8:
                 case DRM_FORMAT_RGB565:
-                        DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
-                                        drm_get_format_name(state->fb->pixel_format));
+                        format_name = drm_get_format_name(state->fb->pixel_format);
+                        DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
 
                 default: