mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Back to regular -misc pulls with reasonable sizes: - dma_fence error clarification (Chris) - drm_crtc_from_index helper (Shawn), pile more patches on the m-l to roll this out to drivers - mmu-less support for fbdev helpers from Benjamin - piles of kerneldoc work - some polish for crc support from Tomeu and Benjamin - odd misc stuff all over * tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc: (48 commits) dma-fence: Introduce drm_fence_set_error() helper dma-fence: Wrap querying the fence->status dma-fence: Clear fence->status during dma_fence_init() drm: fix compilations issues introduced by "drm: allow to use mmuless SoC" drm: Change the return type of the unload hook to void drm: add more document for drm_crtc_from_index() drm: remove useless parameters from drm_pick_cmdline_mode function drm: crc: Call wake_up_interruptible() each time there is a new CRC entry drm: allow to use mmuless SoC drm: compile drm_vm.c only when needed fbmem: add a default get_fb_unmapped_area function drm: crc: Wait for a frame before returning from open() drm: Move locking into drm_debugfs_crtc_crc_add drm/imx: imx-tve: Remove unused variable Revert "drm: nouveau: fix build when LEDS_CLASS=m" drm: Add kernel-doc for drm_crtc_commit_get/put drm/atomic: Fix outdated comment. drm: reference count event->completion gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap drm: Document deprecated load/unload hook ...
This commit is contained in:
commit
282d0a35c8
126 changed files with 831 additions and 580 deletions
|
|
@ -138,6 +138,14 @@ config FB_SYS_IMAGEBLIT
|
|||
blitting. This is used by drivers that don't provide their own
|
||||
(accelerated) version and the framebuffer is in system RAM.
|
||||
|
||||
config FB_PROVIDE_GET_FB_UNMAPPED_AREA
|
||||
bool
|
||||
depends on FB
|
||||
default n
|
||||
---help---
|
||||
Allow generic frame-buffer to provide get_fb_unmapped_area
|
||||
function.
|
||||
|
||||
menuconfig FB_FOREIGN_ENDIAN
|
||||
bool "Framebuffer foreign endianness support"
|
||||
depends on FB
|
||||
|
|
|
|||
|
|
@ -1492,6 +1492,21 @@ __releases(&info->lock)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA
|
||||
unsigned long get_fb_unmapped_area(struct file *filp,
|
||||
unsigned long addr, unsigned long len,
|
||||
unsigned long pgoff, unsigned long flags)
|
||||
{
|
||||
struct fb_info * const info = filp->private_data;
|
||||
unsigned long fb_size = PAGE_ALIGN(info->fix.smem_len);
|
||||
|
||||
if (pgoff > fb_size || len > fb_size - pgoff)
|
||||
return -EINVAL;
|
||||
|
||||
return (unsigned long)info->screen_base + pgoff;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct file_operations fb_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.read = fb_read,
|
||||
|
|
@ -1503,7 +1518,8 @@ static const struct file_operations fb_fops = {
|
|||
.mmap = fb_mmap,
|
||||
.open = fb_open,
|
||||
.release = fb_release,
|
||||
#ifdef HAVE_ARCH_FB_UNMAPPED_AREA
|
||||
#if defined(HAVE_ARCH_FB_UNMAPPED_AREA) || \
|
||||
defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA)
|
||||
.get_unmapped_area = get_fb_unmapped_area,
|
||||
#endif
|
||||
#ifdef CONFIG_FB_DEFERRED_IO
|
||||
|
|
|
|||
Loading…
Reference in a new issue