| Message ID | 1366966123-31432-1-git-send-email-sw0312.kim@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Seung Woo, I had posted the same solution at http://lists.freedesktop.org/archives/dri-devel/2013-January/034119.html. This has been pulled in drm-intel-next. regards, Rahul Sharma. On Fri, Apr 26, 2013 at 2:18 PM, Seung-Woo Kim <sw0312.kim@samsung.com>wrote: > Allocating scatter table with sg_alloc_table() does not consider > contiguous pages. Because sg_alloc_table_from_pages() merges > contigous pages into a signle scatter entry, this patch fixes to > allocate scatter table with it from drm_prime_pages_to_sg(). > > Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> > --- > drivers/gpu/drm/drm_prime.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > index 366910d..8c098a3 100644 > --- a/drivers/gpu/drm/drm_prime.c > +++ b/drivers/gpu/drm/drm_prime.c > @@ -401,21 +401,17 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device > *dev, void *data, > struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) > { > struct sg_table *sg = NULL; > - struct scatterlist *iter; > - int i; > int ret; > > sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL); > if (!sg) > goto out; > > - ret = sg_alloc_table(sg, nr_pages, GFP_KERNEL); > + ret = sg_alloc_table_from_pages(sg, pages, nr_pages, > + 0, PAGE_SIZE * nr_pages, GFP_KERNEL); > if (ret) > goto out; > > - for_each_sg(sg->sgl, iter, nr_pages, i) > - sg_set_page(iter, pages[i], PAGE_SIZE, 0); > - > return sg; > out: > kfree(sg); > -- > 1.7.4.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
Hello Rahul, Thanks for notifying. As your comment, it is same patch with yours, so just ignore my patch. Besg Regards, - Seung-Woo Kim On 2013? 04? 26? 18:14, Rahul Sharma wrote: > Hi Seung Woo, > > I had posted the same solution at > http://lists.freedesktop.org/archives/dri-devel/2013-January/034119.html. > This has been pulled in drm-intel-next. > > regards, > Rahul Sharma. > > > > On Fri, Apr 26, 2013 at 2:18 PM, Seung-Woo Kim <sw0312.kim@samsung.com>wrote: > >> Allocating scatter table with sg_alloc_table() does not consider >> contiguous pages. Because sg_alloc_table_from_pages() merges >> contigous pages into a signle scatter entry, this patch fixes to >> allocate scatter table with it from drm_prime_pages_to_sg(). >> >> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> >> --- >> drivers/gpu/drm/drm_prime.c | 8 ++------ >> 1 files changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c >> index 366910d..8c098a3 100644 >> --- a/drivers/gpu/drm/drm_prime.c >> +++ b/drivers/gpu/drm/drm_prime.c >> @@ -401,21 +401,17 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device >> *dev, void *data, >> struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) >> { >> struct sg_table *sg = NULL; >> - struct scatterlist *iter; >> - int i; >> int ret; >> >> sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL); >> if (!sg) >> goto out; >> >> - ret = sg_alloc_table(sg, nr_pages, GFP_KERNEL); >> + ret = sg_alloc_table_from_pages(sg, pages, nr_pages, >> + 0, PAGE_SIZE * nr_pages, GFP_KERNEL); >> if (ret) >> goto out; >> >> - for_each_sg(sg->sgl, iter, nr_pages, i) >> - sg_set_page(iter, pages[i], PAGE_SIZE, 0); >> - >> return sg; >> out: >> kfree(sg); >> -- >> 1.7.4.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel >> > > > > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 366910d..8c098a3 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -401,21 +401,17 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages) { struct sg_table *sg = NULL; - struct scatterlist *iter; - int i; int ret; sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL); if (!sg) goto out; - ret = sg_alloc_table(sg, nr_pages, GFP_KERNEL); + ret = sg_alloc_table_from_pages(sg, pages, nr_pages, + 0, PAGE_SIZE * nr_pages, GFP_KERNEL); if (ret) goto out; - for_each_sg(sg->sgl, iter, nr_pages, i) - sg_set_page(iter, pages[i], PAGE_SIZE, 0); - return sg; out: kfree(sg);
Allocating scatter table with sg_alloc_table() does not consider contiguous pages. Because sg_alloc_table_from_pages() merges contigous pages into a signle scatter entry, this patch fixes to allocate scatter table with it from drm_prime_pages_to_sg(). Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> --- drivers/gpu/drm/drm_prime.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)