diff options
| author | Rob Clark <robdclark@gmail.com> | 2013-12-04 13:45:43 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 15:48:49 (GMT) |
| commit | 02552ad06e442e48082dbb51a32e5228a1b64f48 (patch) | |
| tree | dcc0e47734bbad0d727f8ce84a75a3beea399522 /drivers/gpu | |
| parent | 707ac20e933383174419cbc739915cb0fcebe063 (diff) | |
| download | linux-fsl-qoriq-02552ad06e442e48082dbb51a32e5228a1b64f48.tar.xz | |
udl: fix issue with imported prime buffers
commit 1d507b3af40a60e03a3bbc4c897fc2709c075d24 upstream.
5dc9e1e8 was a bit over-ambitious, and accidentially removed handling
for imported prime buffers.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Cc: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 8bf6461..f738800 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -132,6 +132,12 @@ static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask) static void udl_gem_put_pages(struct udl_gem_object *obj) { + if (obj->base.import_attach) { + drm_free_large(obj->pages); + obj->pages = NULL; + return; + } + drm_gem_put_pages(&obj->base, obj->pages, false, false); obj->pages = NULL; } |