drm/etnaviv: fix gem_prime_get_sg_table to return new SG table

lynxeye-dev · lynxeye-dev · commit 5f4a4a73f437 · 2016-12-02T19:30:23.000+01:00
The object internal SG table must not be returned, as the caller
will take ownership of the returned table.

Construct a new table from the object pages and return this one
instead.

Signed-off-by: Lucas Stach &lt;l.stach@pengutronix.de&gt;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -23,10 +23,12 @@
 struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)
 {
 	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
+	int npages = obj->size >> PAGE_SHIFT;
 
-	BUG_ON(!etnaviv_obj->sgt);  /* should have already pinned! */
+	if (WARN_ON(!etnaviv_obj->pages))  /* should have already pinned! */
+		return NULL;
 
-	return etnaviv_obj->sgt;
+	return drm_prime_pages_to_sg(etnaviv_obj->pages, npages);
 }
 
 void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj)

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,12 @@`
`23`	`23`	`struct sg_table etnaviv_gem_prime_get_sg_table(struct drm_gem_object obj)`
`24`	`24`	`{`
`25`	`25`	`struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);`
	`26`	`+ int npages = obj->size >> PAGE_SHIFT;`
`26`	`27`
`27`		`- BUG_ON(!etnaviv_obj->sgt); /* should have already pinned! */`
	`28`	`+ if (WARN_ON(!etnaviv_obj->pages)) /* should have already pinned! */`
	`29`	`+ return NULL;`
`28`	`30`
`29`		`- return etnaviv_obj->sgt;`
	`31`	`+ return drm_prime_pages_to_sg(etnaviv_obj->pages, npages);`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`void etnaviv_gem_prime_vmap(struct drm_gem_object obj)`