diff options
| author | Eric Engestrom | 2016-11-12 02:12:56 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2016-11-12 14:19:38 +0100 |
| commit | b3c11ac267d461d3d597967164ff7278a919a39f (patch) | |
| tree | b493960fb72de73ef4a7b202bd0bc96b11340f2a /drivers/gpu/drm/drm_atomic.c | |
| parent | drm: Add missing mutex_destroy in drm_dev_init/release (diff) | |
| download | kernel-qcow2-linux-b3c11ac267d461d3d597967164ff7278a919a39f.tar.gz kernel-qcow2-linux-b3c11ac267d461d3d597967164ff7278a919a39f.tar.xz kernel-qcow2-linux-b3c11ac267d461d3d597967164ff7278a919a39f.zip | |
drm: move allocation out of drm_get_format_name()
The function's behaviour was changed in 90844f00049e, without changing
its signature, causing people to keep using it the old way without
realising they were now leaking memory.
Rob Clark also noticed it was also allocating GFP_KERNEL memory in
atomic contexts, breaking them.
Instead of having to allocate GFP_ATOMIC memory and fixing the callers
to make them cleanup the memory afterwards, let's change the function's
signature by having the caller take care of the memory and passing it to
the function.
The new parameter is a single-field struct in order to enforce the size
of its buffer and help callers to correctly manage their memory.
Fixes: 90844f00049e ("drm: make drm_get_format_name thread-safe")
Cc: Rob Clark <robdclark@gmail.com>
Cc: Christian König <christian.koenig@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Sinclair Yeh <syeh@vmware.com> (vmwgfx)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161112011309.9799-1-eric@engestrom.ch
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index f5ea7db4a48a..57e0a6e96f6d 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -861,9 +861,10 @@ static int drm_atomic_plane_check(struct drm_plane *plane, /* Check whether this plane supports the fb pixel format. */ ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format); if (ret) { - char *format_name = drm_get_format_name(state->fb->pixel_format); - DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name); - kfree(format_name); + struct drm_format_name_buf format_name; + DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", + drm_get_format_name(state->fb->pixel_format, + &format_name)); return ret; } @@ -917,9 +918,10 @@ static void drm_atomic_plane_print_state(struct drm_printer *p, if (state->fb) { struct drm_framebuffer *fb = state->fb; int i, n = drm_format_num_planes(fb->pixel_format); + struct drm_format_name_buf format_name; drm_printf(p, "\t\tformat=%s\n", - drm_get_format_name(fb->pixel_format)); + drm_get_format_name(fb->pixel_format, &format_name)); drm_printf(p, "\t\tsize=%dx%d\n", fb->width, fb->height); drm_printf(p, "\t\tlayers:\n"); for (i = 0; i < n; i++) { |