• Dave Airlie's avatar
    Merge branch 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux into drm-next · ca18e142
    Dave Airlie authored
    KMS driver for TI LCD controller
    
    * 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux:
      drm/tilcdc: add support for LCD panels (v5)
      drm/tilcdc: add encoder slave (v2)
      drm/i2c: nxp-tda998x (v3)
      drm/tilcdc: add TI LCD Controller DRM driver (v4)
      drm/nouveau: use i2c encoder helper wrappers
      drm: i2c encoder helper wrappers
      drm/cma: add debugfs helpers
      drm: small fix in drm_send_vblank_event()
      drm: Don't set the plane->fb to NULL on successfull set_plane
      drm/cma-helper: fixup compilation
    
    Conflicts:
    	drivers/gpu/drm/Kconfig
    	drivers/gpu/drm/Makefile
    	drivers/gpu/drm/drm_fb_cma_helper.c
    ca18e142
drm_fb_cma_helper.c 11.9 KB