From c5e4002d4698ad9aebd5f0c31db650d20120ce63 Mon Sep 17 00:00:00 2001 From: Inki Dae Date: Mon, 23 Apr 2012 19:41:14 +0900 Subject: [PATCH] --- yaml --- r: 299735 b: refs/heads/master c: f6ead8dea518d0d02c576432eba4fa145e64b02a h: refs/heads/master i: 299733: c76a098eb0e890722a8d4203724ca7b0f3f58354 299731: 502698deb494668c182eb0f60e301c6235ecd892 299727: c12aa3502b8669c4eaf14d8ebd17dcdb12776657 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 20f9af699375..deca7bb34d6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 887ea3db26ec8a43b650ada273e1159492939c10 +refs/heads/master: f6ead8dea518d0d02c576432eba4fa145e64b02a diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c index b1850c30e043..f09d292a2e37 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -149,22 +149,12 @@ static int exynos_drm_gem_map_pages(struct drm_gem_object *obj, unsigned long pfn; if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) { - unsigned long usize = buf->size; - if (!buf->pages) return -EINTR; - while (usize > 0) { - pfn = page_to_pfn(buf->pages[page_offset++]); - vm_insert_mixed(vma, f_vaddr, pfn); - f_vaddr += PAGE_SIZE; - usize -= PAGE_SIZE; - } - - return 0; - } - - pfn = (buf->dma_addr >> PAGE_SHIFT) + page_offset; + pfn = page_to_pfn(buf->pages[page_offset++]); + } else + pfn = (buf->dma_addr >> PAGE_SHIFT) + page_offset; return vm_insert_mixed(vma, f_vaddr, pfn); }