mm: kill vma flag VM_RESERVED and mm->reserved_vm counter

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / gpu / drm / gma500 / framebuffer.c

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 5732b5702e1cef5f002ac707fcb34302c33f53de..afded54dbb10c2b8c3b1e727625a5f637002330e 100644 (file)
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -178,8 +178,7 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
         */
        vma->vm_ops = &psbfb_vm_ops;
        vma->vm_private_data = (void *)psbfb;
-       vma->vm_flags |= VM_RESERVED | VM_IO |
-                                       VM_MIXEDMAP | VM_DONTEXPAND;
+       vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP;
        return 0;
 }
 
@@ -764,6 +763,13 @@ static void psb_setup_outputs(struct drm_device *dev)
                        crtc_mask = dev_priv->ops->hdmi_mask;
                        clone_mask = (1 << INTEL_OUTPUT_HDMI);
                        break;
+               case INTEL_OUTPUT_DISPLAYPORT:
+                       crtc_mask = (1 << 0) | (1 << 1);
+                       clone_mask = (1 << INTEL_OUTPUT_DISPLAYPORT);
+                       break;
+               case INTEL_OUTPUT_EDP:
+                       crtc_mask = (1 << 1);
+                       clone_mask = (1 << INTEL_OUTPUT_EDP);
                }
                encoder->possible_crtcs = crtc_mask;
                encoder->possible_clones =