diff options
| author | Rob Clark <robdclark@gmail.com> | 2013-12-04 08:45:43 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-04 18:23:38 -0500 |
| commit | 1d507b3af40a60e03a3bbc4c897fc2709c075d24 (patch) | |
| tree | ee7697fd500b37b4260a596c062829951e1ad7df | |
| parent | c17f5bb529221c7f4c0736e69ceb614da0df2838 (diff) | |
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 <robdclark@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -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 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) | |||
| 125 | 125 | ||
| 126 | static void udl_gem_put_pages(struct udl_gem_object *obj) | 126 | static void udl_gem_put_pages(struct udl_gem_object *obj) |
| 127 | { | 127 | { |
| 128 | if (obj->base.import_attach) { | ||
| 129 | drm_free_large(obj->pages); | ||
| 130 | obj->pages = NULL; | ||
| 131 | return; | ||
| 132 | } | ||
| 133 | |||
| 128 | drm_gem_put_pages(&obj->base, obj->pages, false, false); | 134 | drm_gem_put_pages(&obj->base, obj->pages, false, false); |
| 129 | obj->pages = NULL; | 135 | obj->pages = NULL; |
| 130 | } | 136 | } |
