1. 27 Jan, 2015 33 commits
  2. 23 Jan, 2015 3 commits
  3. 22 Jan, 2015 1 commit
    • Dave Airlie's avatar
      Merge remote-tracking branch 'origin/master' into drm-next · 281d1bbd
      Dave Airlie authored
      Backmerge Linus tree after rc5 + drm-fixes went in.
      
      There were a few amdkfd conflicts I wanted to avoid,
      and Ben requested this for nouveau also.
      
      Conflicts:
      	drivers/gpu/drm/amd/amdkfd/Makefile
      	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
      	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
      	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
      	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
      	drivers/gpu/drm/i915/intel_runtime_pm.c
      	drivers/gpu/drm/radeon/radeon_kfd.c
      281d1bbd
  4. 21 Jan, 2015 3 commits
    • Dave Airlie's avatar
      Merge branch 'drm-sti-next-add-dvo' of... · bfa55bd4
      Dave Airlie authored
      Merge branch 'drm-sti-next-add-dvo' of git://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
      
      This patch enable the last big hardware feature of my driver: the
      connector for panel.
      Like for HMDI and HDA, Digital Video Out (DVO) create brige, encoder
      and connector
      drm objects.
      
      * 'drm-sti-next-add-dvo' of git://git.linaro.org/people/benjamin.gaignard/kernel:
        drm: sti: add DVO output connector
      bfa55bd4
    • Dave Airlie's avatar
      Merge tag 'atmel-hlcdc-drm-3.20' of https://github.com/bbrezillon/linux-at91 into drm-next · c0d2792b
      Dave Airlie authored
      Add atmel HLCDC driver.
      
      * tag 'atmel-hlcdc-drm-3.20' of https://github.com/bbrezillon/linux-at91:
        drm: add DT bindings documentation for atmel-hlcdc-dc driver
        drm: add Atmel HLCDC Display Controller support
        drm: panel: simple-panel: add bus format information for foxlink panel
        drm: panel: simple-panel: add support for bus_format retrieval
        drm: add bus_formats and num_bus_formats fields to drm_display_info
      c0d2792b
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-2015-01-21' of git://people.freedesktop.org/~gabbayo/linux into drm-next · ca1130de
      Dave Airlie authored
      - Infrastructure work in amdkfd to prepare for VI support. This work mainly
        includes separating modules into ASIC-specific functionality, adding
        new properties that are relevant for VI, making sure that shared code is
        reused, etc.
      
      - Improve mechanism of submitting packets to HIQ (the kernel queue that amdkfd
        uses to issue commands to the GPU). The driver used to verify that each CS
        was read by the GPU. However, this proved to be both unnecessary and erroneous.
        Therefore, we cancelled this verification.
      
      - Moved initialization of compute VMIDs into radeon driver
      
      - Various minor fixes
      
      * tag 'drm-amdkfd-next-2015-01-21' of git://people.freedesktop.org/~gabbayo/linux: (22 commits)
        drm/amdkfd: Fix description of sched_policy module parameter
        drm/amdkfd: Remove sync_with_hw() from amdkfd
        drm/amdkfd: Remove unused function busy_wait()
        drm/amdkfd: Replace cpu_relax() with schedule() in DQM
        drm/amdkfd: Fix for-loop when allocating HQD (non-HWS)
        drm/amdkfd: Add initial VI support for KQ
        drm/amdkfd: Encapsulate KQ functions in ops structure
        drm/amdkfd: Add initial VI support for DQM
        drm/amdkfd: Encapsulate DQM functions in ops structure
        drm/amdkfd: Don't BUG on freeing GART sub-allocation
        drm/amdkfd: Fix logic of destroy_queue_nocpsch()
        MAINTAINERS: Update amdkfd files
        drm/amdkfd: Change MQD manager to be H/W specific
        drm/amdkfd: Add asic property to kfd_device_info
        drm/amdkfd: Make KFD_MQD_TYPE enum types H/W agnostic
        drm/amdkfd: Add new VI-specific queue properties
        drm/radeon: Use new cik_structs.h file
        drm/amdkfd: Don't include header files from radeon
        drm/amd: Put cik structures in a common place
        drm/radeon: Don't use relative paths in #include
        ...
      ca1130de