mwifiex: fix typo in PCIe adapter NULL check

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_gem.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 52187aec8692e2b475dedde4ec3b2fb68108febb..d48183e7e056d56a8932ae06baf1bc172ce02893 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -99,34 +99,23 @@ static int exynos_drm_gem_map_buf(struct drm_gem_object *obj,
        unsigned long pfn;
        int i;
 
-       if (exynos_gem_obj->flags & EXYNOS_BO_NONCONTIG) {
-               if (!buf->sgt)
-                       return -EINTR;
-
-               sgl = buf->sgt->sgl;
-               for_each_sg(buf->sgt->sgl, sgl, buf->sgt->nents, i) {
-                       if (!sgl) {
-                               DRM_ERROR("invalid SG table\n");
-                               return -EINTR;
-                       }
-                       if (page_offset < (sgl->length >> PAGE_SHIFT))
-                               break;
-                       page_offset -=  (sgl->length >> PAGE_SHIFT);
-               }
-
-               if (i >= buf->sgt->nents) {
-                       DRM_ERROR("invalid page offset\n");
-                       return -EINVAL;
-               }
+       if (!buf->sgt)
+               return -EINTR;
 
-               pfn = __phys_to_pfn(sg_phys(sgl)) + page_offset;
-       } else {
-               if (!buf->pages)
-                       return -EINTR;
+       if (page_offset >= (buf->size >> PAGE_SHIFT)) {
+               DRM_ERROR("invalid page offset\n");
+               return -EINVAL;
+       }
 
-               pfn = page_to_pfn(buf->pages[0]) + page_offset;
+       sgl = buf->sgt->sgl;
+       for_each_sg(buf->sgt->sgl, sgl, buf->sgt->nents, i) {
+               if (page_offset < (sgl->length >> PAGE_SHIFT))
+                       break;
+               page_offset -=  (sgl->length >> PAGE_SHIFT);
        }
 
+       pfn = __phys_to_pfn(sg_phys(sgl)) + page_offset;
+
        return vm_insert_mixed(vma, f_vaddr, pfn);
 }
 
@@ -411,7 +400,7 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp,
        if (vm_size > buffer->size)
                return -EINVAL;
 
-       ret = dma_mmap_attrs(drm_dev->dev, vma, buffer->kvaddr,
+       ret = dma_mmap_attrs(drm_dev->dev, vma, buffer->pages,
                                buffer->dma_addr, buffer->size,
                                &buffer->dma_attrs);
        if (ret < 0) {