diff options
Diffstat (limited to 'drivers/gpu/drm/udl/udl_fb.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 15 | 
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index b8c00ed3305..69a2b16f42a 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -15,13 +15,12 @@  #include <linux/fb.h>  #include <linux/dma-buf.h> -#include "drmP.h" -#include "drm.h" -#include "drm_crtc.h" -#include "drm_crtc_helper.h" +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h>  #include "udl_drv.h" -#include "drm_fb_helper.h" +#include <drm/drm_fb_helper.h>  #define DL_DEFIO_WRITE_DELAY    5 /* fb_deferred_io.delay in jiffies */ @@ -244,7 +243,7 @@ static int udl_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)  			size = 0;  	} -	vma->vm_flags |= VM_RESERVED;	/* avoid to swap out this VMA */ +	/* VM_IO | VM_DONTEXPAND | VM_DONTDUMP are set by remap_pfn_range() */  	return 0;  } @@ -357,12 +356,12 @@ static struct fb_ops udlfb_ops = {  	.fb_release = udl_fb_release,  }; -void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, +static void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,  			   u16 blue, int regno)  {  } -void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, +static void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,  			     u16 *blue, int regno)  {  	*red = 0;  |