From: Rob Clark Date: Wed, 4 Dec 2013 13:45:43 +0000 (-0500) Subject: udl: fix issue with imported prime buffers X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d507b3af40a60e03a3bbc4c897fc2709c075d24;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git udl: fix issue with imported prime buffers 5dc9e1e8 was a bit over-ambitious, and accidentially removed handling for imported prime buffers. Signed-off-by: Rob Clark Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 24ffbe990736..8d67b943ac05 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -125,6 +125,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; }