1. 16 Oct, 2015 3 commits
    • Dave Airlie's avatar
      Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 9ace42b1
      Dave Airlie authored
      This series:
      * adds support for interlaced video modes to the ipu-v3 driver
        and dw_hdmi bridge.
      * reworks the dw_hdmi connector enable/disable support, to ensure that
        when DRM disables the output, it stays disabled irrespective of the
        hotplug state.
      * adds support for connector forcing, so we can force the hotplug state
        for this connector.
      * adds the ALSA AHB audio driver to the bridge: Iwai has acked the
        audio driver.
      * a few fixes to the ACR calculations to allow more modes to work with
        audio on iMX6.
      
      Fabio has independently tested this series, so all patches here carry
      his tested-by tag.
      
      * 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm: bridge/dw_hdmi: replace CTS calculation for the ACR
        drm: bridge/dw_hdmi: remove ratio support from ACR code
        drm: bridge/dw_hdmi: adjust pixel clock values in N calculation
        drm: bridge/dw_hdmi: avoid being recursive in N calculation
        drm: bridge/dw_hdmi-ahb-audio: allow larger buffer sizes
        drm: bridge/dw_hdmi-ahb-audio: basic support for multi-channel PCM audio
        drm: bridge/dw_hdmi-ahb-audio: parse ELD from HDMI driver
        drm: bridge/dw_hdmi-ahb-audio: add audio driver
        drm: bridge/dw_hdmi: improve HDMI enable/disable handling
        drm: bridge/dw_hdmi: add connector mode forcing
        drm: bridge/dw_hdmi: add support for interlaced video modes
        gpu: imx: fix support for interlaced modes
        gpu: imx: simplify sync polarity setting
      9ace42b1
    • Dave Airlie's avatar
      Merge commit '06d1ee32' of... · 48f87dd1
      Dave Airlie authored
      Merge commit '06d1ee32' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
      
      Backmerge the drm-fixes pull from Linus's tree into drm-next.
      
      This is to fix some conflicts and make future pulls cleaner
      48f87dd1
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-intel into drm-next · 6b62b3e1
      Dave Airlie authored
      Another round of drm-misc. Unfortunately the DRM_UNLOCKED removal for
      DRIVER_MODESET isn't complete yet for lack of review on 1-2 patches.
      Otherwise just various stuff all over.
      
      * tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-intel:
        drm: Stop using drm_vblank_count() as the hw frame counter
        drm/irq: Use unsigned int pipe in public API
        drm: Use DRM_ROTATE_MASK and DRM_REFLECT_MASK
        drm: Add DRM_ROTATE_MASK and DRM_REFLECT_MASK
        vga_switcheroo: Add missing locking
        vgaarb: use kzalloc in vga_arbiter_add_pci_device()
        drm: Don't zero vblank timestamps from the irq handler
        drm: Hack around CONFIG_AGP=m build failures
        drm/i915: Remove setparam ioctl
        drm: Remove dummy agp ioctl wrappers
        drm/vmwgfx: Stop checking for DRM_UNLOCKED
        drm/drm_ioctl.c: kerneldoc
        drm: Define a drm_invalid_op ioctl implementation
        drm: Remove __OS_HAS_AGP
        drm/doc: Update docs about device instance setup
      6b62b3e1
  2. 15 Oct, 2015 4 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-09-28-merged' of... · b3127855
      Dave Airlie authored
      Merge tag 'drm-intel-next-2015-09-28-merged' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      drm-intel-next-2015-09-28:
      - fastboot by default for some systems (Maarten Lankhorts)
      - piles of workarounds for bxt and skl
      - more fbc work from Paulo
      - fix hdmi hotplug detection (Sonika)
      - first few patches from Ville to parametrize register macros, prep work for
        typesafe mmio functions
      - prep work for nv12 rotation (Tvrtko Ursulin)
      - various other bugfixes and improvements all over
      
      I have another backmerge here since things became messy and I didn't
      realize you resolved some of them already (usually you complain when
      there's a conflict ...).
      
      For 4.4 I plan one more feature round after this and then that's it.
      * tag 'drm-intel-next-2015-09-28-merged' of git://anongit.freedesktop.org/drm-intel: (80 commits)
        drm/i915: Update DRIVER_DATE to 20150928
        drm/i915: fix task reference leak in i915_debugfs.c
        drm/i915: Defer adding preallocated stolen objects to the VM list
        drm/i915: Remove extraneous request cancel.
        drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset
        drm/i915: Support NV12 in rotated GGTT mapping
        drm/i915: Support appending to the rotated pages mapping
        drm/i915: Support planar formats in tile height calculations
        drm/i915/bxt: Update revision id for BXT C0
        drm/i915: Parametrize CSR_PROGRAM registers
        drm/i915: Parametrize DDI_BUF_TRANS registers
        drm/i915: Parametrize TV luma/chroma filter registers
        drm/i915: Replace raw numbers with the approproate register name in ILK turbo code
        drm/i915: Parametrize ILK turbo registers
        drm/i915: Parametrize FBC_TAG registers
        drm/i915: Parametrize GEN7_GT_SCRATCH and GEN7_LRA_LIMITS
        drm/i915: Parametrize LRC registers
        drm/i915: Don't pass sdvo_reg to intel_sdvo_select_{ddc, i2c}_bus()
        drm/i915: Ignore "digital output" and "not HDMI output" bits for eDP detection
        drm/i915: Make sure we don't detect eDP on g4x
        ...
      b3127855
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next · aa1b36f2
      Dave Airlie authored
      This is the first radeon and amdgpu pull for drm-next. Highlights include:
      - Efficiency improvements to the CS checker for pre-SI asics
      - Cursor fixes ported from radeon to amdgpu
      - Enable GPU scheduler by default
      - Add a bunch of GPUVM debugging options
      - Add support for some new atombios opcodes
      - Misc cleanups and fixes
      
      * 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux: (42 commits)
        drm/amdgpu: fix lockup when clean pending fences
        drm/amdgpu: add timer to fence to detect scheduler lockup
        drm/amdgpu: add VM CS mapping trace point
        drm/amdgpu: add option to clear VM page tables after every submit
        drm/amdgpu: add option to stop on VM fault
        drm/amdgpu: only print meaningful VM faults
        drm/amdgpu: also trace already allocated VMIDs
        drm/amdgpu: Drop unnecessary #include <linux/vga_switcheroo.h>
        drm/radeon: Drop unnecessary #include <linux/vga_switcheroo.h>
        drm/amdgpu: clean up pageflip interrupt handling
        drm/amdgpu: rework sdma structures
        drm/amdgpu: unpin cursor BOs on suspend and pin them again on resume
        drm/amdgpu/dce8: Fold set_cursor() into show_cursor()
        drm/amdgpu/dce8: Clean up reference counting and pinning of the cursor BOs
        drm/amdgpu/dce8: Move hotspot handling out of set_cursor
        drm/amdgpu/dce8: Re-show the cursor after a modeset (v2)
        drm/amdgpu/dce8: Use cursor_set2 hook for enabling / disabling the HW cursor
        drm/amdgpu/dce11: Fold set_cursor() into show_cursor()
        drm/amdgpu/dce11: Clean up reference counting and pinning of the cursor BOs
        drm/amdgpu/dce11: Move hotspot handling out of set_cursor
        ...
      aa1b36f2
    • Dave Airlie's avatar
      Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 99a91c94
      Dave Airlie authored
      * removes the now unused DRM slave encoder support, which all users have
        migrated away from, allowing us to simplify the code.
      * ensure all pending interrupts are processed together, rather than
        needing the handler to be re-entered each time.
      * use more HDMI helpers to setup the info frames.
      * fix EDID read handling by ensuring that we always wait the specified time
        before attempting to read the EDID, no matter where the EDID read request
        came from.
      
      * 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/i2c: tda998x: clean up after struct tda998x_priv2 removal
        drm/i2c: tda998x: kill struct tda998x_priv2
        drm/i2c: tda998x: move connector into struct tda998x_priv
        drm/i2c: tda998x: remove encoder pointer
        drm/i2c: tda998x: remove DRM slave encoder support
        drm/i2c: tda998x: use more HDMI helpers
        drm/i2c: tda998x: handle all outstanding interrupts
        drm/i2c: tda998x: convert to u8/u16/u32 types
        drm/i2c: tda998x: re-implement "Fix EDID read timeout on HDMI connect"
        drm/i2c: tda998x: report whether we actually handled the IRQ
        drm/i2c: tda998x: remove useless NULL checks
      99a91c94
    • Dave Airlie's avatar
      Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · bbbe29d8
      Dave Airlie authored
      * remove support for the non-component support from the Armada DRM driver,
        switching it to component-only mode.
      * create a "armada plane" to allow the primary and overlay planes to share
        some code.
      * increase efficiency by using inherently atomic operations, rather than
        spinlocking to achieve atomicity.  Eg, if we want to exchange a value,
        using xchg().
      * increase PM savings by stopping the external pixel clock when we're in
        DPMS mode.
      
      * 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/armada: move frame wait wakeup into plane work
        drm/armada: convert overlay plane vbl worker to a armada plane worker
        drm/armada: move CRTC flip work to primary plane work
        drm/armada: move frame wait into armada_frame
        drm/armada: move the locking for armada_drm_vbl_event_remove()
        drm/armada: move the update of dplane->ctrl0 out of spinlock
        drm/armada: move write to dma_ctrl0 to armada_drm_crtc_plane_disable()
        drm/armada: provide a common helper to disable a plane
        drm/armada: allocate primary plane ourselves
        drm/armada: add primary plane creation
        drm/armada: introduce generic armada_plane struct
        drm/armada: update armada overlay to use drm_universal_plane_init()
        drm/armada: use xchg() to atomically update dplane->old_fb
        drm/armada: factor out retirement of old fb
        drm/armada: rename overlay identifiers
        drm/armada: redo locking and atomics for armada_drm_crtc_complete_frame_work()
        drm/armada: disable CRTC clock during DPMS
        drm/armada: use drm_plane_force_disable() to disable the overlay plane
        drm/armada: move vbl code into armada_crtc
        drm/armada: remove non-component support
      bbbe29d8
  3. 14 Oct, 2015 31 commits
  4. 13 Oct, 2015 1 commit
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 06d1ee32
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "I got a bit behind last week, so here is a delayed fixes pull:
      
         - a bunch of radeon/amd gpu fixes
         - some nouveau regression fixes (ppc bios reading and runtime pm fix)
         - one drm core oops fix
         - two qxl locking fixes
         - one qxl regression fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau/bios: fix OF loading
        drm/nouveau/fbcon: take runpm reference when userspace has an open fd
        drm/nouveau/nouveau: Disable AGP for SiS 761
        drm/nouveau/display: allow up to 16k width/height for fermi+
        drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
        drm: Fix locking for sysfs dpms file
        drm/amdgpu: fix memory leak in amdgpu_vm_update_page_directory
        drm/amdgpu: fix 32-bit compiler warning
        drm/qxl: avoid dependency lock
        drm/qxl: avoid buffer reservation in qxl_crtc_page_flip
        drm/qxl: fix framebuffer dirty rectangle tracking.
        drm/amdgpu: flag iceland as experimental
        drm/amdgpu: check before checking pci bridge registers
        drm/amdgpu: fix num_crtc on CZ
        drm/amdgpu: restore the fbdev mode in lastclose
        drm/radeon: restore the fbdev mode in lastclose
        drm/radeon: add quirk for ASUS R7 370
        drm/amdgpu: add pm sysfs files late
        drm/radeon: add pm sysfs files late
      06d1ee32
  5. 12 Oct, 2015 1 commit