diff options
author | Eric Engestrom <eric@engestrom.ch> | 2016-08-14 20:02:38 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-15 03:25:12 -0400 |
commit | 90844f00049e9f42573fd31d7c32e8fd31d3fd07 (patch) | |
tree | 60303fd6ee2cb480548f847790090e786f5f70fd /drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | |
parent | fc93ff608b15ae32cde3006b7af860b59cac20ec (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index d4bf133908b1..1558a974ad00 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | |||
@@ -2046,6 +2046,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc, | |||
2046 | u32 tmp, viewport_w, viewport_h; | 2046 | u32 tmp, viewport_w, viewport_h; |
2047 | int r; | 2047 | int r; |
2048 | bool bypass_lut = false; | 2048 | bool bypass_lut = false; |
2049 | const char *format_name; | ||
2049 | 2050 | ||
2050 | /* no fb bound */ | 2051 | /* no fb bound */ |
2051 | if (!atomic && !crtc->primary->fb) { | 2052 | if (!atomic && !crtc->primary->fb) { |
@@ -2157,8 +2158,9 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc, | |||
2157 | bypass_lut = true; | 2158 | bypass_lut = true; |
2158 | break; | 2159 | break; |
2159 | default: | 2160 | default: |
2160 | DRM_ERROR("Unsupported screen format %s\n", | 2161 | format_name = drm_get_format_name(target_fb->pixel_format); |
2161 | drm_get_format_name(target_fb->pixel_format)); | 2162 | DRM_ERROR("Unsupported screen format %s\n", format_name); |
2163 | kfree(format_name); | ||
2162 | return -EINVAL; | 2164 | return -EINVAL; |
2163 | } | 2165 | } |
2164 | 2166 | ||