• Linus Torvalds's avatar
    Merge tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · d43fb9f3
    Linus Torvalds authored
    Pull fbdev updates from Tomi Valkeinen:
     "Summary:
    
       - pxafb: device-tree support
       - An unsafe kernel parameter 'lockless_register_fb' for debugging
         problems happening while inside the console lock
       - Small miscellaneous fixes & cleanups
       - omapdss: add writeback support functions
       - Separation of omapfb and omapdrm (see below)
    
      About the separation of omapfb and omapdrm, see
    
        http://permalink.gmane.org/gmane.comp.video.dri.devel/143151
    
      for longer story.  The short version:
    
      omapfb and omapdrm have shared low level drivers (omapdss and panel
      drivers), making further development of omapdrm difficult.  After
      these patches omapfb and omapdrm have their own versions of the
      drivers, which are more or less direct copies for now but will diverge
      soon.
    
      This also means that omapfb (everything under drivers/video/fbdev/omap2/)
      is now in maintenance mode, and all new development will be done for
      omapdrm (drivers/gpu/drm/omapdrm/)"
    
    * tag 'fbdev-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (49 commits)
      video: fbdev: pxafb: fix out of memory error path
      drm/omap: make omapdrm select OMAP2_DSS
      drm/omap: move omapdss & displays under omapdrm
      omapfb: move vrfb into omapfb
      omapfb: take omapfb's private omapdss into use
      omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*
      omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
      omapdss: remove CONFIG_OMAP2_DSS_VENC from omapdss.h
      omapfb: copy omapdss & displays for omapfb
      omapfb: allow compilation only if DRM_OMAP is disabled
      fbdev: omap2: panel-dpi: simplify gpio setting
      fbdev: omap2: panel-dpi: in .disable first disable backlight then display
      OMAPDSS: DSS: fix a warning message
      video: omapdss: delete unneeded of_node_put
      OMAPDSS: DISPC: Remove boolean comparisons
      OMAPDSS: DSI: cleanup DSI_IRQ_ERROR_MASK define
      OMAPDSS: remove extra out == NULL checks
      OMAPDSS: change internal dispc functions to static
      OMAPDSS: make a two dss feat funcs internal to omapdss
      OMAPDSS: remove extra EXPORT_SYMBOLs
      ...
    d43fb9f3
Makefile 2.66 KB