1. 02 Mar, 2016 2 commits
    • Dave Airlie's avatar
      Merge tag 'imx-drm-next-20160301' of git://git.pengutronix.de/git/pza/linux into drm-next · 42e85606
      Dave Airlie authored
      imx-drm vblank IRQ control, fence support, and of endpoint helpers
      
      - Add and make use of drm_of_active_endpoint helpers
      - Silence a noisy dev_info into a dev_dbg
      - Stop touching primary fb on pageflips
      - Track flip state explicitly
      - Keep GEM buffer objects referenced while scanout is active
      - Implement fence sync by deferring flips to a workqueue for
        dma-bufs with pending fences
      - Actually disable vblank IRQs while they are not needed
      
      * tag 'imx-drm-next-20160301' of git://git.pengutronix.de/git/pza/linux:
        drm/imx: only enable vblank IRQs when needed
        drm/imx: implement fence sync
        drm/imx: keep GEM object referenced as long as scanout is active
        drm/imx: track flip state explicitly
        drm/imx: don't touch primary fb on pageflip
        drm/imx: ipuv3 plane: Replace dev_info with dev_dbg if a plane's CRTC changes
        gpu: ipu-v3: ipu-dc: Simplify display controller microcode setup
        drm/rockchip: remove rockchip_drm_encoder_get_mux_id
        drm/imx: remove imx_drm_encoder_get_mux_id
        drm: add drm_of_encoder_active_endpoint helpers
      42e85606
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-next' of... · 4b59d591
      Dave Airlie authored
      Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
         Summary:
         - Add Exynos5420 SoC support to FIMD driver.
           . This patch makes MIC(Mobile Image Compressor) IP to be bypassed in default
             in case of Exynos5420 and later. The Display pipe line configuraion for
             Exynos DRM driver will be considered through of graph concept later.
         - Add Exynos5422 SoC support to MIPI-DSI driver.
           . Exynos5422 SoC is similar to Exynos5433 SoC but software reset is different
             each other so this patch consideres the difference.
         - Get more precise clock divider value of FIMD controller.
           . This patch changes DIV_ROUND_CLOSEST macro to be used instead of DIV_ROUND_UP.
         - Refactor Exynos DRM device and driver registeration.
           . This patch makes Exynos DRM driver to be easy-to-read and at the same time,
             cleans it up by removing #ifdef ~ #endif things.
         - Configure DMA-mapping address space common to Exynos DRM devices in more generic
           without any hacks.
         - some fixups and cleanups.
      
      * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (26 commits)
        drm/exynos/dsi: use core helper to create DSI packet
        drm/exynos: use real device for DMA-mapping operations
        drm/exynos: refactor driver and device registration code
        drm/exynos: use arch independent types in uapi header
        drm/exynos: remove platform data structures and include/drm/exynos_drm.h
        drm/exynos/fimc: remove unused camera interface polarization code
        drm/exynos: remove struct exynos_drm_panel_info
        drm/exynos: add exynos5420 support for fimd
        drm/exynos: use DIV_ROUND_CLOSEST to find the closest div
        drm/exynos: remove incorrect ccflags from Makefile
        drm/exynos/decon: make irq handler static
        drm/exynos/hdmi: remove unused variable
        drm/exynos/dsi: constify read only structures
        drm/exynos/dsi: replace registry access macros with functions
        drm/exynos: support exynos5422 mipi-dsi
        drm/exynos/decon: fix disable clocks order
        drm/exynos: fix incorrect cpu address for dma_mmap_attrs()
        drm/exynos: exynos5433_decon: fix wrong state in decon_vblank_enable
        drm/exynos: exynos5433_decon: fix wrong state assignment in decon_enable
        drm/exynos: dsi: restore support for drm bridge
        ...
      4b59d591
  2. 01 Mar, 2016 37 commits
  3. 27 Feb, 2016 1 commit
    • Oded Gabbay's avatar
      drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded · efb1c658
      Oded Gabbay authored
      amdgpu must load only after amdkfd's loading has been completed. If that
      is not enforced, then amdgpu's call into amdkfd's functions will cause a
      kernel BUG.
      
      When amdgpu and amdkfd are built as kernel modules, that rule is enforced
      by the kernel's modules loading mechanism. When amdgpu and amdkfd are
      built inside the kernel image, that rule is enforced by ordering in the
      drm Makefile (amdkfd before amdgpu).
      
      Instead of using drm Makefile ordering, we can now use deferred loading
      as amdkfd now returns -EPROBE_DEFER in kgd2kfd_init() when it is not yet
      loaded.
      
      This patch defers amdgpu loading by propagating -EPROBE_DEFER to the
      kernel's drivers loading infrastructure. That will put amdgpu into the
      pending drivers list (see description in dd.c). Once amdkfd is loaded,
      a call to kgd2kfd_init() will return successfully and amdgpu will be able
      to load.
      Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      efb1c658