1. 25 Jan, 2015 21 commits
  2. 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
  3. 21 Jan, 2015 15 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
    • Linus Torvalds's avatar
      Merge tag 'trace-sh-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · b942c653
      Linus Torvalds authored
      Pull superh tracing fix from Steven Rostedt:
       "It's been reported that function tracing does not work on the sh
        architecture because gcc 4.8 for superH does not support -m32, and the
        recordmcount.pl script adds "-m32" when re-compiling the object files
        with the mcount locations.
      
        I was not able to reproduce this problem, as it seems that -m32 works
        fine for my cross compiler gcc 4.6.3, but I have to assume that -m32
        was deprecated somewhere between 4.6 and 4.8.  As it still seems to
        compile fine without -m32, I have no reason not to add this patch, as
        having -m32 seems to cause trouble for others"
      
      * tag 'trace-sh-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore
      b942c653
    • Boris Brezillon's avatar
      drm: add DT bindings documentation for atmel-hlcdc-dc driver · 5b7e944e
      Boris Brezillon authored
      The Atmel HLCDC (HLCD Controller) IP available on some Atmel SoCs (i.e.
      at91sam9n12, at91sam9x5 family or sama5d3 family) provides a display
      controller device.
      
      The HLCDC block provides a single RGB output port, and only supports LCD
      panels connection to LCD panels for now.
      
      The atmel,panel property link the HLCDC RGB output with the LCD panel
      connected on this port (note that the HLCDC RGB connector implementation
      makes use of the DRM panel framework).
      
      Connection to other external devices (DRM bridges) might be added later by
      mean of a new atmel,xxx (atmel,bridge) property.
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      5b7e944e
    • Boris Brezillon's avatar
      drm: add Atmel HLCDC Display Controller support · 1a396789
      Boris Brezillon authored
      The Atmel HLCDC (HLCD Controller) IP available on some Atmel SoCs (i.e.
      at91sam9n12, at91sam9x5 family or sama5d3 family) provides a display
      controller device.
      
      This display controller supports at least one primary plane and might
      provide several overlays and an hardware cursor depending on the IP
      version.
      
      At the moment, this driver only implements an RGB connector to interface
      with LCD panels, but support for other kind of external devices might be
      added later.
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
      Tested-by: default avatarAnthony Harivel <anthony.harivel@emtrion.de>
      Tested-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      1a396789
    • Boris Brezillon's avatar
      drm: panel: simple-panel: add bus format information for foxlink panel · bb276cb3
      Boris Brezillon authored
      Foxlink's fl500wvr00-a0t supports RGB888 format.
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      bb276cb3
    • Boris Brezillon's avatar
      drm: panel: simple-panel: add support for bus_format retrieval · 795f7ab3
      Boris Brezillon authored
      Provide a way to specify panel requirement in terms of supported media bus
      format (particularly useful for panels connected to an RGB or LVDS bus).
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      795f7ab3
    • Boris Brezillon's avatar
      drm: add bus_formats and num_bus_formats fields to drm_display_info · b5571e9d
      Boris Brezillon authored
      Add bus_formats and num_bus_formats fields and
      drm_display_info_set_bus_formats helper function to specify the bus
      formats supported by a given display.
      
      This information can be used by display controller drivers to configure
      the output interface appropriately (i.e. RGB565, RGB666 or RGB888 on raw
      RGB or LVDS busses).
      Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      b5571e9d
    • Linus Torvalds's avatar
      Merge tag 'sound-3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5eb11d6b
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This batch contains two fixes for FireWire lib module and a quirk for
        yet another Logitech WebCam.  The former is the fixes for MIDI
        handling I forgot to pick up during the merge window.  All the fixed
        code is pretty local and shouldn't give any regressions"
      
      * tag 'sound-3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210
        ALSA: firewire-lib: limit the MIDI data rate
        ALSA: firewire-lib: remove rx_blocks_for_midi quirk
      5eb11d6b
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 479459a8
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Just back from LCA + some days off, had some fixes from the past 2 weeks,
      
        Some amdkfd code removal for a feature that wasn't ready, otherwise
        just one fix for core helper sleeping, exynos, i915, and radeon fixes.
      
        I thought I had some sti fixes but they were already in, and it
        confused me for a few mins this morning"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: fb helper should avoid sleeping in panic context
        drm/exynos: fix warning of vblank reference count
        drm/exynos: remove unnecessary runtime pm operations
        drm/exynos: fix reset codes for memory mapped hdmi phy
        drm/radeon: use rv515_ring_start on r5xx
        drm/radeon: add si dpm quirk list
        drm/radeon: don't print error on -ERESTARTSYS
        drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES
        drm/i915: Ban Haswell from using RCS flips
        drm/i915: vlv: sanitize RPS interrupt mask during GPU idling
        drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6
        drm/i915: gen9: fix RPS interrupt routing to CPU vs. GT
        drm/exynos: remove the redundant machine checking code
        drm/radeon: add a dpm quirk list
        drm/amdkfd: Fix sparse warning (different address space)
        drm/radeon: fix VM flush on CIK (v3)
        drm/radeon: fix VM flush on SI (v3)
        drm/radeon: fix VM flush on cayman/aruba (v3)
        drm/amdkfd: Drop interrupt SW ring buffer
      479459a8
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 7c4bb81c
      Linus Torvalds authored
      Pull MFD fixes from Lee Jones:
       - Avoid platform ID collision in da9052
       - Skip caching volatile registers in tps65218
       - Use correct address base in tps65218
       - Repair deadlock on suspend in rtsx_usb
      
      * tag 'mfd-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: rtsx_usb: Fix runtime PM deadlock
        mfd: tps65218: Make INT1 our status_base register
        mfd: tps65218: Make INT[12] and STATUS registers volatile
        mfd: da9052-core: Fix platform-device id collision
      7c4bb81c
    • Dave Airlie's avatar
      Merge tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux into drm-next · fc839753
      Dave Airlie authored
      imx-drm mode fixup support, imx-hdmi bridge conversion and imx-drm cleanup
      
      - Implement mode_fixup for a DI vertical timing limitation
      - Use generic DRM OF helpers in DRM core
      - Convert imx-hdmi to dw_hdmi drm_bridge and add rockchip
        driver
      - Add DC use counter to fix multi-display support
      - Simplify handling of DI clock flags
      - A few small fixes and cleanup
      
      * tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux: (26 commits)
        imx-drm: core: handling of DI clock flags to ipu_crtc_mode_set()
        gpu: ipu-di: Switch to DIV_ROUND_CLOSEST for DI clock divider calc
        gpu: ipu-v3: Use videomode in struct ipu_di_signal_cfg
        imx-drm: encoder prepare/mode_set must use adjusted mode
        imx-drm: ipuv3-crtc: Implement mode_fixup
        drm_modes: add drm_display_mode_to_videomode
        gpu: ipu-di: remove some non-functional code
        gpu: ipu-di: Add ipu_di_adjust_videomode()
        drm: rockchip: export functions needed by rockchip dw_hdmi bridge driver
        drm: bridge/dw_hdmi: request interrupt only after initializing the mutes
        drm: bridge/dw_hdmi: add rockchip rk3288 support
        dt-bindings: Add documentation for rockchip dw hdmi
        drm: bridge/dw_hdmi: add function dw_hdmi_phy_enable_spare
        drm: bridge/dw_hdmi: clear i2cmphy_stat0 reg in hdmi_phy_wait_i2c_done
        drm: bridge/dw_hdmi: add mode_valid support
        drm: bridge/dw_hdmi: add support for multi-byte register width access
        dt-bindings: add document for dw_hdmi
        drm: imx: imx-hdmi: move imx-hdmi to bridge/dw_hdmi
        drm: imx: imx-hdmi: split phy configuration to platform driver
        drm: imx: imx-hdmi: convert imx-hdmi to drm_bridge mode
        ...
      fc839753
    • Dave Airlie's avatar
      Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next · b2eb0489
      Dave Airlie authored
      * 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
        drm: rcar-du: Implement support for interlaced modes
        drm: rcar-du: Clamp DPMS states to on and off
        drm: rcar-du: Enable hotplug detection on HDMI connector
        drm: rcar-du: Output HSYNC instead of CSYNC
        drm: rcar-du: Add support for external pixel clock
        drm: rcar-du: Refactor DEFR8 feature
        drm: rcar-du: Remove LVDS and HDMI encoders chaining restriction
        drm: rcar-du: Configure pitch for chroma plane of multiplanar formats
        drm: rcar-du: Don't fail probe in case of partial encoder init error
        drm: adv7511: Remove interlaced mode check
      b2eb0489
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-2015-01-09' of git://people.freedesktop.org/~gabbayo/linux into drm-next · 4f4d89af
      Dave Airlie authored
      - Add support for SDMA usermode queues
      - Replace logic of sub-allocating from GART buffer in amdkfd. Instead
        of using radeon_sa module, use a new module that is more suited for
        this purpose
      - Add the number of watch points to amdkfd topology
      - Split a function that did two things into two seperate functions.
      
      * tag 'drm-amdkfd-next-2015-01-09' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amd: Remove old radeon_sa funcs from kfd-->kgd interface
        drm/radeon: Remove old radeon_sa usage from kfd-->kgd interface
        drm/amdkfd: Using new gtt sa in amdkfd
        drm/amdkfd: Allocate gart memory using new interface
        drm/amdkfd: Fixed calculation of gart buffer size
        drm/amdkfd: Add kfd gtt sub-allocator functions
        drm/amdkfd: Add gtt sa related data to kfd_dev struct
        drm/radeon: Impl. new gtt allocate/free functions
        drm/amd: Add new kfd-->kgd interface for gart usage
        drm/radeon: Enable sdma preemption
        drm/amdkfd: Pass queue type to pqm_create_queue()
        drm/amdkfd: Identify SDMA queue in create queue ioctl
        drm/amdkfd: Add SDMA user-mode queues support to QCM
        drm/amdkfd: Add SDMA mqd support
        drm/radeon: Implement SDMA interface functions
        drm/amd: Add SDMA functions to kfd-->kgd interface
        drm/amdkfd: Process-device data creation and lookup split
        drm/amdkfd: Add number of watch points to topology
      4f4d89af
  4. 20 Jan, 2015 3 commits
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-fixes-2015-01-13' of... · 67cf2d39
      Dave Airlie authored
      Merge tag 'drm-amdkfd-fixes-2015-01-13' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
      
      - Remove the interrupt SW ring buffer impl. as it is not used by any module
        in amdkfd.
      
      - Fix a sparse warning
      
      * tag 'drm-amdkfd-fixes-2015-01-13' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: Fix sparse warning (different address space)
        drm/amdkfd: Drop interrupt SW ring buffer
      67cf2d39
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-01-15' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 9e4fc22a
      Dave Airlie authored
      misc i915 fixes
      
      * tag 'drm-intel-fixes-2015-01-15' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES
        drm/i915: Ban Haswell from using RCS flips
        drm/i915: vlv: sanitize RPS interrupt mask during GPU idling
        drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6
        drm/i915: gen9: fix RPS interrupt routing to CPU vs. GT
      9e4fc22a
    • Rui Wang's avatar
      drm: fb helper should avoid sleeping in panic context · 9aa609e1
      Rui Wang authored
      There are still some places in the fb helper that need to avoid
      sleeping in panic context. Here's an example:
      
      [   65.615496] bad: scheduling from the idle thread!
      [   65.620747] CPU: 92 PID: 0 Comm: swapper/92 Tainted: G   M        E  3.18.0-rc4-7-default+ #20
      
      [   65.630364] Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS
      BRHSXSD1.86B.0056.R01.1409242327 09/24/2014
      [   65.641923]  ffff88087f693d80 ffff88087f689878 ffffffff81566db9 0000000000000000
      [   65.650226]  ffff88087f693d80 ffff88087f689898 ffffffff810871ff ffff88046eb3e0d0
      [   65.658527]  ffff88087f693d80 ffff88087f6898c8 ffffffff8107c1fa 000000017f6898b8
      [   65.666830] Call Trace:
      [   65.669557]  <#MC>  [<ffffffff81566db9>] dump_stack+0x46/0x58
      [   65.675994]  [<ffffffff810871ff>] dequeue_task_idle+0x2f/0x40
      [   65.682412]  [<ffffffff8107c1fa>] dequeue_task+0x5a/0x80
      [   65.688345]  [<ffffffff810804f3>] deactivate_task+0x23/0x30
      [   65.694569]  [<ffffffff81569050>] __schedule+0x580/0x7f0
      [   65.700502]  [<ffffffff81569739>] schedule_preempt_disabled+0x29/0x70
      [   65.707696]  [<ffffffff8156abb6>] __ww_mutex_lock_slowpath+0xb8/0x162
      [   65.714891]  [<ffffffff8156acb3>] __ww_mutex_lock+0x53/0x85
      [   65.721125]  [<ffffffffa00b3a5d>] drm_modeset_lock+0x3d/0x110 [drm]
      [   65.728132]  [<ffffffffa00b3c2a>] __drm_modeset_lock_all+0x8a/0x120 [drm]
      [   65.735721]  [<ffffffffa00b3cd0>] drm_modeset_lock_all+0x10/0x30 [drm]
      [   65.743015]  [<ffffffffa01af8bf>] drm_fb_helper_pan_display+0x2f/0xf0 [drm_kms_helper]
      [   65.751857]  [<ffffffff8132bd21>] fb_pan_display+0xd1/0x1a0
      [   65.758081]  [<ffffffff81326010>] bit_update_start+0x20/0x50
      [   65.764400]  [<ffffffff813259f2>] fbcon_switch+0x3a2/0x550
      [   65.770528]  [<ffffffff813a01c9>] redraw_screen+0x189/0x240
      [   65.776750]  [<ffffffff81322f8a>] fbcon_blank+0x20a/0x2d0
      [   65.782778]  [<ffffffff8137d359>] ? erst_writer+0x209/0x330
      [   65.789002]  [<ffffffff810ba2f3>] ? internal_add_timer+0x63/0x80
      [   65.795710]  [<ffffffff810bc137>] ? mod_timer+0x127/0x1e0
      [   65.801740]  [<ffffffff813a0cd8>] do_unblank_screen+0xa8/0x1d0
      [   65.808255]  [<ffffffff813a0e10>] unblank_screen+0x10/0x20
      [   65.814381]  [<ffffffff812ca0d9>] bust_spinlocks+0x19/0x40
      [   65.820508]  [<ffffffff81561ca7>] panic+0x106/0x1f5
      [   65.825955]  [<ffffffff8102336c>] mce_panic+0x2ac/0x2e0
      [   65.831789]  [<ffffffff812c796a>] ? delay_tsc+0x4a/0x80
      [   65.837625]  [<ffffffff81024e1f>] do_machine_check+0xbaf/0xbf0
      [   65.844138]  [<ffffffff813365d7>] ? intel_idle+0xc7/0x150
      [   65.850166]  [<ffffffff8156f03f>] machine_check+0x1f/0x30
      [   65.856195]  [<ffffffff813365d7>] ? intel_idle+0xc7/0x150
      [   65.862222]  <<EOE>>  [<ffffffff814283d5>] cpuidle_enter_state+0x55/0x170
      [   65.869823]  [<ffffffff814285a7>] cpuidle_enter+0x17/0x20
      [   65.875852]  [<ffffffff81097b08>] cpu_startup_entry+0x2d8/0x370
      [   65.882467]  [<ffffffff8102fe29>] start_secondary+0x159/0x180
      
      There's __drm_modeset_lock_all() which Daniel Vetter introduced for this
      purpose. We can leverage that without reinventing anything. This patch
      works with the latest kernel.
      Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
      Tested-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarRui Wang <rui.y.wang@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      9aa609e1