1. 30 Jan, 2017 1 commit
  2. 27 Jan, 2017 5 commits
    • Chris Wilson's avatar
      drm/sti: Fix compilation failure for drm_framebuffer.pixel_format · a5b2b6eb
      Chris Wilson authored
      drivers/gpu/drm/sti/sti_plane.c:76:33: error: ‘struct drm_framebuffer’
      has no member named ‘pixel_format’; did you mean ‘format’?
      
      I didn't look to hard at the casting to a char * and just did a
      mechanical transformation of s/pixel_format/format->format/ as given in
      commit 438b74a5 ("drm: Nuke fb->pixel_format").
      
      Fixes: 438b74a5 ("drm: Nuke fb->pixel_format")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
      Cc: Vincent Abriou <vincent.abriou@st.com>
      Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a5b2b6eb
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc into drm-next · 3875623c
      Dave Airlie authored
      - cleanups&fixes for dw-hdmi bride driver (Laurent)
      - updates for adv bridge driver (John Stultz) for nexus
      - drm_crtc_from_index helper rollout (Shawn Guo)
      - removing drm_framebuffer_unregister_private from drivers&core
      - target_vblank (Andrey Grodzovsky)
      - misc tiny stuff
      
      * tag 'drm-misc-next-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc: (49 commits)
        drm: qxl: Open code teardown function for qxl
        drm: qxl: Open code probing sequence for qxl
        drm/bridge: adv7511: Re-write the i2c address before EDID probing
        drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID
        drm/bridge: adv7511: Rework adv7511_power_on/off() so they can be reused internally
        drm/bridge: adv7511: Enable HPD interrupts to support hotplug and improve monitor detection
        drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event()
        drm/bridge: adv7511: Use work_struct to defer hotplug handing to out of irq context
        drm: vc4: use crtc helper drm_crtc_from_index()
        drm: tegra: use crtc helper drm_crtc_from_index()
        drm: nouveau: use crtc helper drm_crtc_from_index()
        drm: mediatek: use crtc helper drm_crtc_from_index()
        drm: kirin: use crtc helper drm_crtc_from_index()
        drm: exynos: use crtc helper drm_crtc_from_index()
        dt-bindings: display: dw-hdmi: Clean up DT bindings documentation
        drm: bridge: dw-hdmi: Assert SVSRET before resetting the PHY
        drm: bridge: dw-hdmi: Fix the name of the PHY reset macros
        drm: bridge: dw-hdmi: Define and use macros for PHY register addresses
        drm: bridge: dw-hdmi: Detect PHY type at runtime
        drm: bridge: dw-hdmi: Handle overflow workaround based on device version
        ...
      3875623c
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2017-01-23' of git://anongit.freedesktop.org/git/drm-intel into drm-next · a7e2641a
      Dave Airlie authored
      Final block of feature work for 4.11:
      
      - gen8 pd cleanup from Matthew Auld
      - more cleanups for view/vma (Chris)
      - dmc support on glk (Anusha Srivatsa)
      - use core crc api (Tomue)
      - track wedged requests using fence.error (Chris)
      - lots of psr fixes (Nagaraju, Vathsala)
      - dp mst support, acked for merging through drm-intel by Takashi
        (Libin)
      - huc loading support, including uapi for libva to use it (Anusha
        Srivatsa)
      
      * tag 'drm-intel-next-2017-01-23' of git://anongit.freedesktop.org/git/drm-intel: (111 commits)
        drm/i915: Update DRIVER_DATE to 20170123
        drm/i915: reinstate call to trace_i915_vma_bind
        drm/i915: Assert that created vma has a whole number of pages
        drm/i915: Assert the drm_mm_node is allocated when on the VM lists
        drm/i915: Treat an error from i915_vma_instance() as unlikely
        drm/i915: Reject vma creation larger than address space
        drm/i915: Use common LRU inactive vma bumping for unpin_from_display
        drm/i915: Do an unlocked wait before set-cache-level ioctl
        drm/i915/huc: Assert that HuC vma is placed in GuC accessible range
        drm/i915/huc: Avoid attempting to authenticate non-existent fw
        drm/i915: Set adjustment to zero on Up/Down interrupts if freq is already max/min
        drm/i915: Remove the double handling of 'flags from intel_mode_from_pipe_config()
        drm/i915: Remove crtc->config usage from intel_modeset_readout_hw_state()
        drm/i915: Release temporary load-detect state upon switching
        drm/i915: Remove i915_gem_object_to_ggtt()
        drm/i915: Remove i915_vma_create from VMA API
        drm/i915: Add a check that the VMA instance we lookup matches the request
        drm/i915: Rename some warts in the VMA API
        drm/i915: Track pinned vma in intel_plane_state
        drm/i915/get_params: Add HuC status to getparams
        ...
      a7e2641a
    • Dave Airlie's avatar
      Reinstate "drm/probe-helpers: Drop locking from poll_enable"" · c4d79c22
      Dave Airlie authored
      This reverts commit 54a07c7b,
      and reinstates the original.
      
      [airlied: this might be a bad plan for git].
      
      commit 3846fd9b
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Wed Jan 11 10:01:17 2017 +0100
      
          drm/probe-helpers: Drop locking from poll_enable
      
          It was only needed to protect the connector_list walking, see
      
          commit 8c4ccc4a
          Author: Daniel Vetter <daniel.vetter@ffwll.ch>
          Date:   Thu Jul 9 23:44:26 2015 +0200
      
              drm/probe-helper: Grab mode_config.mutex in poll_init/enable
      
          Unfortunately the commit message of that patch fails to mention that
          the new locking check was for the connector_list.
      
          But that requirement disappeared in
      
          commit c36a3254
          Author: Daniel Vetter <daniel.vetter@ffwll.ch>
          Date:   Thu Dec 15 16:58:43 2016 +0100
      
              drm: Convert all helpers to drm_connector_list_iter
      
          and so we can drop this again.
      
          This fixes a locking inversion on nouveau, where the rpm code needs to
          re-enable. But in other places the rpm_get() calls are nested within
          the big modeset locks.
      
          While at it, also improve the kerneldoc for these two functions a
          notch.
      
          v2: Update the kerneldoc even more to explain that these functions
          can't be called concurrently, or bad things happen (Chris).
      c4d79c22
    • Dave Airlie's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next · b0df0b25
      Dave Airlie authored
      Backmerge Linus master to get the connector locking revert.
      
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits)
        sysctl: fix proc_doulongvec_ms_jiffies_minmax()
        Revert "drm/probe-helpers: Drop locking from poll_enable"
        MAINTAINERS: add Dan Streetman to zbud maintainers
        MAINTAINERS: add Dan Streetman to zswap maintainers
        mm: do not export ioremap_page_range symbol for external module
        mn10300: fix build error of missing fpu_save()
        romfs: use different way to generate fsid for BLOCK or MTD
        frv: add missing atomic64 operations
        mm, page_alloc: fix premature OOM when racing with cpuset mems update
        mm, page_alloc: move cpuset seqcount checking to slowpath
        mm, page_alloc: fix fast-path race with cpuset update or removal
        mm, page_alloc: fix check for NULL preferred_zone
        kernel/panic.c: add missing \n
        fbdev: color map copying bounds checking
        frv: add atomic64_add_unless()
        mm/mempolicy.c: do not put mempolicy before using its nodemask
        radix-tree: fix private list warnings
        Documentation/filesystems/proc.txt: add VmPin
        mm, memcg: do not retry precharge charges
        proc: add a schedule point in proc_pid_readdir()
        ...
      b0df0b25
  3. 26 Jan, 2017 3 commits
    • Eric Dumazet's avatar
      sysctl: fix proc_doulongvec_ms_jiffies_minmax() · ff9f8a7c
      Eric Dumazet authored
      We perform the conversion between kernel jiffies and ms only when
      exporting kernel value to user space.
      
      We need to do the opposite operation when value is written by user.
      
      Only matters when HZ != 1000
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff9f8a7c
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 928d336a
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
       "A bunch of pin control fixes for v4.10 that didn't get sent off until
        now, sorry for the delay.
      
        It's only driver fixes:
      
         - A bunch of fixes to the Intel drivers: broxton, baytrail. Bugs
           related to register offsets, IRQ, debounce functionality.
      
         - Fix a conflict amongst UART settings on the meson.
      
         - Fix the ethernet setting on the Uniphier.
      
         - A compilation warning squelched"
      
      * tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20
        pinctrl: meson: fix uart_ao_b for GXBB and GXL/GXM
        pinctrl: amd: avoid maybe-uninitalized warning
        pinctrl: baytrail: Do not add all GPIOs to IRQ domain
        pinctrl: baytrail: Rectify debounce support
        pinctrl: intel: Set pin direction properly
        pinctrl: broxton: Use correct PADCFGLOCK offset
      928d336a
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux · bed7b016
      Linus Torvalds authored
      Pull drm revert from Dave Airlie:
       "Revert one patch missing some prereqs.
      
        One of the connector fixes was missing some prereqs, we have an
        alternate driver fix that should work that I'll send tomorrow.
      
        Today is a holiday here so quickly smashing this out"
      
      Daniel Vetter explains:
       "I pushed a locking change to fix a nouveau rpm issue to -fixes that
        needed the connector_list rework. And that's only in -next, but I
        missed that. Dave has the revert in a pull, and he'll follow-up with
        the hack nouveau patch for 4.10, and then we'll reapply the proper fix
        again for -next and revert the hacks. A bit a mess, but should be
        sorted soon"
      
      * tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux:
        Revert "drm/probe-helpers: Drop locking from poll_enable"
      bed7b016
  4. 25 Jan, 2017 29 commits
  5. 24 Jan, 2017 2 commits
    • Will Deacon's avatar
      vring: Force use of DMA API for ARM-based systems with legacy devices · c7070619
      Will Deacon authored
      Booting Linux on an ARM fastmodel containing an SMMU emulation results
      in an unexpected I/O page fault from the legacy virtio-blk PCI device:
      
      [    1.211721] arm-smmu-v3 2b400000.smmu: event 0x10 received:
      [    1.211800] arm-smmu-v3 2b400000.smmu:	0x00000000fffff010
      [    1.211880] arm-smmu-v3 2b400000.smmu:	0x0000020800000000
      [    1.211959] arm-smmu-v3 2b400000.smmu:	0x00000008fa081002
      [    1.212075] arm-smmu-v3 2b400000.smmu:	0x0000000000000000
      [    1.212155] arm-smmu-v3 2b400000.smmu: event 0x10 received:
      [    1.212234] arm-smmu-v3 2b400000.smmu:	0x00000000fffff010
      [    1.212314] arm-smmu-v3 2b400000.smmu:	0x0000020800000000
      [    1.212394] arm-smmu-v3 2b400000.smmu:	0x00000008fa081000
      [    1.212471] arm-smmu-v3 2b400000.smmu:	0x0000000000000000
      
      <system hangs failing to read partition table>
      
      This is because the legacy virtio-blk device is behind an SMMU, so we
      have consequently swizzled its DMA ops and configured the SMMU to
      translate accesses. This then requires the vring code to use the DMA API
      to establish translations, otherwise all transactions will result in
      fatal faults and termination.
      
      Given that ARM-based systems only see an SMMU if one is really present
      (the topology is all described by firmware tables such as device-tree or
      IORT), then we can safely use the DMA API for all legacy virtio devices.
      Modern devices can advertise the prescense of an IOMMU using the
      VIRTIO_F_IOMMU_PLATFORM feature flag.
      
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Cc: <stable@vger.kernel.org>
      Fixes: 876945db ("arm64: Hook up IOMMU dma_ops")
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      c7070619
    • Robin Murphy's avatar
      virtio_mmio: Set DMA masks appropriately · f7f6634d
      Robin Murphy authored
      Once DMA API usage is enabled, it becomes apparent that virtio-mmio is
      inadvertently relying on the default 32-bit DMA mask, which leads to
      problems like rapidly exhausting SWIOTLB bounce buffers.
      
      Ensure that we set the appropriate 64-bit DMA mask whenever possible,
      with the coherent mask suitably limited for the legacy vring as per
      a0be1db4 ("virtio_pci: Limit DMA mask to 44 bits for legacy virtio
      devices").
      
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Reported-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
      Fixes: b4211138 ("virtio_mmio: Use the DMA API if enabled")
      Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      f7f6634d