projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f9cb50
)
drm/msm: fix msm_gem_prime_get_sg_table()
author
Rob Clark
<
[email protected]
>
Thu, 23 Jul 2015 17:44:56 +0000
(13:44 -0400)
committer
Rob Clark
<
[email protected]
>
Fri, 14 Aug 2015 21:10:13 +0000
(17:10 -0400)
We need to return a new sgt, since the caller takes ownership of it.
Reported-by: Stanimir Varbanov <
[email protected]
>
Signed-off-by: Rob Clark <
[email protected]
>
drivers/gpu/drm/msm/msm_gem_prime.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/msm/msm_gem_prime.c
b/drivers/gpu/drm/msm/msm_gem_prime.c
index dd7a7ab603e2c202ea297575fab0aba003234f5b..831461bc98a549e8a3627cbd1cf5a1b4a3250c7b 100644
(file)
--- a/
drivers/gpu/drm/msm/msm_gem_prime.c
+++ b/
drivers/gpu/drm/msm/msm_gem_prime.c
@@
-23,8
+23,12
@@
struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
{
struct msm_gem_object *msm_obj = to_msm_bo(obj);
- BUG_ON(!msm_obj->sgt); /* should have already pinned! */
- return msm_obj->sgt;
+ int npages = obj->size >> PAGE_SHIFT;
+
+ if (WARN_ON(!msm_obj->pages)) /* should have already pinned! */
+ return NULL;
+
+ return drm_prime_pages_to_sg(msm_obj->pages, npages);
}
void *msm_gem_prime_vmap(struct drm_gem_object *obj)