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, 25 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c6f27ab99e8f..acc1ba36c5fa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12258,6 +12258,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
 
         DRM_DEBUG_KMS("planes on this crtc\n");
         list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
+                const char *format_name;
                 intel_plane = to_intel_plane(plane);
                 if (intel_plane->pipe != crtc->pipe)
                         continue;
@@ -12270,11 +12271,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
                         continue;
                 }
 
+                format_name = drm_get_format_name(fb->pixel_format);
+
                 DRM_DEBUG_KMS("[PLANE:%d:%s] enabled",
                               plane->base.id, plane->name);
                 DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s",
-                              fb->base.id, fb->width, fb->height,
-                              drm_get_format_name(fb->pixel_format));
+                              fb->base.id, fb->width, fb->height, format_name);
                 DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n",
                               state->scaler_id,
                               state->base.src.x1 >> 16,
@@ -12284,6 +12286,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
                               state->base.dst.x1, state->base.dst.y1,
                               drm_rect_width(&state->base.dst),
                               drm_rect_height(&state->base.dst));
+
+                kfree(format_name);
         }
 }
 
@@ -14911,6 +14915,7 @@ static int intel_framebuffer_init(struct drm_device *dev,
         unsigned int aligned_height;
         int ret;
         u32 pitch_limit, stride_alignment;
+        const char *format_name;
 
         WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
@@ -14985,16 +14990,18 @@ static int intel_framebuffer_init(struct drm_device *dev,
                 break;
         case DRM_FORMAT_XRGB1555:
                 if (INTEL_INFO(dev)->gen > 3) {
-                        DRM_DEBUG("unsupported pixel format: %s\n",
-                                  drm_get_format_name(mode_cmd->pixel_format));
+                        format_name = drm_get_format_name(mode_cmd->pixel_format);
+                        DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
                 }
                 break;
         case DRM_FORMAT_ABGR8888:
                 if (!IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev) &&
                     INTEL_INFO(dev)->gen < 9) {
-                        DRM_DEBUG("unsupported pixel format: %s\n",
-                                  drm_get_format_name(mode_cmd->pixel_format));
+                        format_name = drm_get_format_name(mode_cmd->pixel_format);
+                        DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
                 }
                 break;
@@ -15002,15 +15009,17 @@ static int intel_framebuffer_init(struct drm_device *dev,
         case DRM_FORMAT_XRGB2101010:
         case DRM_FORMAT_XBGR2101010:
                 if (INTEL_INFO(dev)->gen < 4) {
-                        DRM_DEBUG("unsupported pixel format: %s\n",
-                                  drm_get_format_name(mode_cmd->pixel_format));
+                        format_name = drm_get_format_name(mode_cmd->pixel_format);
+                        DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
                 }
                 break;
         case DRM_FORMAT_ABGR2101010:
                 if (!IS_VALLEYVIEW(dev) && !IS_CHERRYVIEW(dev)) {
-                        DRM_DEBUG("unsupported pixel format: %s\n",
-                                  drm_get_format_name(mode_cmd->pixel_format));
+                        format_name = drm_get_format_name(mode_cmd->pixel_format);
+                        DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
                 }
                 break;
@@ -15019,14 +15028,16 @@ static int intel_framebuffer_init(struct drm_device *dev,
         case DRM_FORMAT_YVYU:
         case DRM_FORMAT_VYUY:
                 if (INTEL_INFO(dev)->gen < 5) {
-                        DRM_DEBUG("unsupported pixel format: %s\n",
-                                  drm_get_format_name(mode_cmd->pixel_format));
+                        format_name = drm_get_format_name(mode_cmd->pixel_format);
+                        DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                        kfree(format_name);
                         return -EINVAL;
                 }
                 break;
         default:
-                DRM_DEBUG("unsupported pixel format: %s\n",
-                          drm_get_format_name(mode_cmd->pixel_format));
+                format_name = drm_get_format_name(mode_cmd->pixel_format);
+                DRM_DEBUG("unsupported pixel format: %s\n", format_name);
+                kfree(format_name);
                 return -EINVAL;
         }