1. 25 Oct, 2016 7 commits
    • Chris Wilson's avatar
      dma-buf: Rename struct fence to dma_fence · f54d1867
      Chris Wilson authored
      I plan to usurp the short name of struct fence for a core kernel struct,
      and so I need to rename the specialised fence/timeline for DMA
      operations to make room.
      
      A consensus was reached in
      https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html
      that making clear this fence applies to DMA operations was a good thing.
      Since then the patch has grown a bit as usage increases, so hopefully it
      remains a good thing!
      
      (v2...: rebase, rerun spatch)
      v3: Compile on msm, spotted a manual fixup that I broke.
      v4: Try again for msm, sorry Daniel
      
      coccinelle script:
      @@
      
      @@
      - struct fence
      + struct dma_fence
      @@
      
      @@
      - struct fence_ops
      + struct dma_fence_ops
      @@
      
      @@
      - struct fence_cb
      + struct dma_fence_cb
      @@
      
      @@
      - struct fence_array
      + struct dma_fence_array
      @@
      
      @@
      - enum fence_flag_bits
      + enum dma_fence_flag_bits
      @@
      
      @@
      (
      - fence_init
      + dma_fence_init
      |
      - fence_release
      + dma_fence_release
      |
      - fence_free
      + dma_fence_free
      |
      - fence_get
      + dma_fence_get
      |
      - fence_get_rcu
      + dma_fence_get_rcu
      |
      - fence_put
      + dma_fence_put
      |
      - fence_signal
      + dma_fence_signal
      |
      - fence_signal_locked
      + dma_fence_signal_locked
      |
      - fence_default_wait
      + dma_fence_default_wait
      |
      - fence_add_callback
      + dma_fence_add_callback
      |
      - fence_remove_callback
      + dma_fence_remove_callback
      |
      - fence_enable_sw_signaling
      + dma_fence_enable_sw_signaling
      |
      - fence_is_signaled_locked
      + dma_fence_is_signaled_locked
      |
      - fence_is_signaled
      + dma_fence_is_signaled
      |
      - fence_is_later
      + dma_fence_is_later
      |
      - fence_later
      + dma_fence_later
      |
      - fence_wait_timeout
      + dma_fence_wait_timeout
      |
      - fence_wait_any_timeout
      + dma_fence_wait_any_timeout
      |
      - fence_wait
      + dma_fence_wait
      |
      - fence_context_alloc
      + dma_fence_context_alloc
      |
      - fence_array_create
      + dma_fence_array_create
      |
      - to_fence_array
      + to_dma_fence_array
      |
      - fence_is_array
      + dma_fence_is_array
      |
      - trace_fence_emit
      + trace_dma_fence_emit
      |
      - FENCE_TRACE
      + DMA_FENCE_TRACE
      |
      - FENCE_WARN
      + DMA_FENCE_WARN
      |
      - FENCE_ERR
      + DMA_FENCE_ERR
      )
       (
       ...
       )
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
      Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
      Acked-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
      f54d1867
    • Daniel Vetter's avatar
      Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc · 0fc4f78f
      Daniel Vetter authored
      Backmerge latest drm-next to have a baseline for the
      s/fence/dma_fence/ patch from Chris.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      0fc4f78f
    • Rob Clark's avatar
    • Imre Deak's avatar
      drm/dp: Factor out helper to distinguish between branch and sink devices · 714cf7ea
      Imre Deak authored
      This check is open-coded in a few places, so it makes sense to simplify
      things by having a helper for it similar to the rest of DPCD feature
      helpers.
      
      v2: (Jani)
      - Move the helper to drm_dp_helper.h.
      - Split out this change to a separate patch.
      
      Cc: Jani Nikula <jani.nikula@intel.com>
      Cc: dri-devel@lists.freedesktop.org
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/1477326811-30431-2-git-send-email-imre.deak@intel.com
      714cf7ea
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next · 5481e27f
      Dave Airlie authored
      - first slice of the gvt device model (Zhenyu et al)
      - compression support for gpu error states (Chris)
      - sunset clause on gpu errors resulting in dmesg noise telling users
        how to report them
      - .rodata diet from Tvrtko
      - switch over lots of macros to only take dev_priv (Tvrtko)
      - underrun suppression for dp link training (Ville)
      - lspcon (hmdi 2.0 on skl/bxt) support from Shashank Sharma, polish
        from Jani
      - gen9 wm fixes from Paulo&Lyude
      - updated ddi programming for kbl (Rodrigo)
      - respect alternate aux/ddc pins (from vbt) for all ddi ports (Ville)
      
      * tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel: (227 commits)
        drm/i915: Update DRIVER_DATE to 20161024
        drm/i915: Stop setting SNB min-freq-table 0 on powersave setup
        drm/i915/dp: add lane_count check in intel_dp_check_link_status
        drm/i915: Fix whitespace issues
        drm/i915: Clean up DDI DDC/AUX CH sanitation
        drm/i915: Respect alternate_ddc_pin for all DDI ports
        drm/i915: Respect alternate_aux_channel for all DDI ports
        drm/i915/gen9: Remove WaEnableYV12BugFixInHalfSliceChicken7
        drm/i915: KBL - Recommended buffer translation programming for DisplayPort
        drm/i915: Move down skl/kbl ddi iboost and n_edp_entires fixup
        drm/i915: Add a sunset clause to GPU hang logging
        drm/i915: Stop reporting error details in dmesg as well as the error-state
        drm/i915/gvt: do not ignore return value of create_scratch_page
        drm/i915/gvt: fix spare warnings on odd constant _Bool cast
        drm/i915/gvt: mark symbols static where possible
        drm/i915/gvt: fix sparse warnings on different address spaces
        drm/i915/gvt: properly access enabled intel_engine_cs
        drm/i915/gvt: Remove defunct vmap_batch()
        drm/i915/gvt: Use common mapping routines for shadow_bb object
        drm/i915/gvt: Use common mapping routines for indirect_ctx object
        ...
      5481e27f
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2016-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next · 61d0a04d
      Dave Airlie authored
      First -misc pull for 4.10:
      - drm_format rework from Laurent
      - reservation patches from Chris that missed 4.9.
      - aspect ratio support in infoframe helpers and drm mode/edid code
        (Shashank Sharma)
      - rotation rework from Ville (first parts at least)
      - another attempt at the CRC debugfs interface from Tomeu
      - piles and piles of misc patches all over
      
      * tag 'topic/drm-misc-2016-10-24' of git://anongit.freedesktop.org/drm-intel: (55 commits)
        drm: Use u64 for intermediate dotclock calculations
        drm/i915: Use the per-plane rotation property
        drm/omap: Use per-plane rotation property
        drm/omap: Set rotation property initial value to BIT(DRM_ROTATE_0) insted of 0
        drm/atmel-hlcdc: Use per-plane rotation property
        drm/arm: Use per-plane rotation property
        drm: Add support for optional per-plane rotation property
        drm/atomic: Reject attempts to use multiple rotation angles at once
        drm: Add drm_rotation_90_or_270()
        dma-buf/sync_file: hold reference to fence when creating sync_file
        drm/virtio: kconfig: Fixup white space.
        drm/fence: release fence reference when canceling event
        drm/i915: Handle early failure during intel_get_load_detect_pipe
        drm/fb_cma_helper: do not free fbdev if there is none
        drm: fix sparse warnings on undeclared symbols in crc debugfs
        gpu: Remove depends on RESET_CONTROLLER when not a provider
        i915: don't call drm_atomic_state_put on invalid pointer
        drm: Don't export the drm_fb_get_bpp_depth() function
        drm/arm: mali-dp: Replace drm_fb_get_bpp_depth() with drm_format_plane_cpp()
        drm: vmwgfx: Replace drm_fb_get_bpp_depth() with drm_format_info()
        ...
      61d0a04d
    • Chris Wilson's avatar
      drm/edid: Only print the bad edid when aborting · 14544d09
      Chris Wilson authored
      Currently, if drm.debug is enabled, we get a DRM_ERROR message on the
      intermediate edid reads. This causes transient failures in CI which
      flags up the sporadic EDID read failures, which are recovered by
      rereading the EDID automatically. This patch combines the reporting done
      by drm_do_get_edid() itself with the bad block printing from
      get_edid_block(), into a single warning associated with the connector
      once all attempts to retrieve the EDID fail.
      
      v2: Print the whole EDID, marking up the bad/zero blocks. This requires
      recording the whole of the raw edid, then a second pass to reduce it to
      the valid extensions.
      v3: Fix invalid/valid extension fumble.
      
      References: https://bugs.freedesktop.org/show_bug.cgi?id=98228Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/20161024113821.26263-1-chris@chris-wilson.co.uk
      14544d09
  2. 24 Oct, 2016 6 commits
  3. 23 Oct, 2016 5 commits
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs · 5ff93abc
      Linus Torvalds authored
      Pull UBI[FS] fixes from Richard Weinberger:
       "This contains fixes for issues in both UBI and UBIFS:
      
         - Fallout from the merge window, refactoring UBI code introduced some
           issues.
      
         - Fixes for an UBIFS readdir bug which can cause getdents() to busy
           loop for ever and a bug in the UBIFS xattr code"
      
      * tag 'upstream-4.9-rc2' of git://git.infradead.org/linux-ubifs:
        ubifs: Abort readdir upon error
        UBI: Fix crash in try_recover_peb()
        ubi: fix swapped arguments to call to ubi_alloc_aeb
        ubifs: Fix xattr_names length in exit paths
        ubifs: Rename ubifs_rename2
      5ff93abc
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · c761923c
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "A few bug fixes and add some missing KERN_CONT annotations"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: add missing KERN_CONT to a few more debugging uses
        fscrypto: lock inode while setting encryption policy
        ext4: correct endianness conversion in __xattr_check_inode()
        fscrypto: make XTS tweak initialization endian-independent
        ext4: do not advertise encryption support when disabled
        jbd2: fix incorrect unlock on j_list_lock
        ext4: super.c: Update logging style using KERN_CONT
      c761923c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a55da8a0
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the outstanding target-pending fixes for v4.9-rc2.
      
        This includes:
      
         - Fix v4.1.y+ reference leak regression with concurrent TMR
           ABORT_TASK + session shutdown. (Vaibhav Tandon)
      
         - Enable tcm_fc w/ SCF_USE_CPUID to avoid host exchange timeouts
           (Hannes)
      
         - target/user error sense handling fixes. (Andy + MNC + HCH)
      
         - Fix iscsi-target NOP_OUT error path iscsi_cmd descriptor leak
           (Varun)
      
         - Two EXTENDED_COPY SCSI status fixes for ESX VAAI (Dinesh Israni +
           Nixon Vincent)
      
         - Revert a v4.8 residual overflow change, that breaks sg_inq with
           small allocation lengths.
      
        There are a number of folks stress testing the v4.1.y regression fix
        in their environments, and more folks doing iser-target I/O stress
        testing atop recent v4.x.y code.
      
        There is also one v4.2.y+ RCU conversion regression related to
        explicit NodeACL configfs changes, that is still being tracked down"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target/tcm_fc: use CPU affinity for responses
        target/tcm_fc: Update debugging statements to match libfc usage
        target/tcm_fc: return detailed error in ft_sess_create()
        target/tcm_fc: print command pointer in debug message
        target: fix potential race window in target_sess_cmd_list_waiting()
        Revert "target: Fix residual overflow handling in target_complete_cmd_with_length"
        target: Don't override EXTENDED_COPY xcopy_pt_cmd SCSI status code
        target: Make EXTENDED_COPY 0xe4 failure return COPY TARGET DEVICE NOT REACHABLE
        target: Re-add missing SCF_ACK_KREF assignment in v4.1.y
        iscsi-target: fix iscsi cmd leak
        iscsi-target: fix spelling mistake "Unsolicitied" -> "Unsolicited"
        target/user: Fix comments to not refer to data ring
        target/user: Return an error if cmd data size is too large
        target/user: Use sense_reason_t in tcmu_queue_cmd_ring
      a55da8a0
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.9-rc2' of... · e6995f22
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
       "Couple of hwmon fixes:
      
        Fix a potential ERR_PTR dereference in max31790 driver, and handle
        temperature readings below 0 in adm9240 driver"
      
      * tag 'hwmon-for-linus-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (max31790) potential ERR_PTR dereference
        hwmon: (adm9240) handle temperature readings below 0
      e6995f22
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi · 5766e9d2
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "A small bug fix and a new driver for acting as an IPMI device.
      
        I was on vacation during the merge window (a long vacation) but this
        is a bug fix that should go in and a new driver that shouldn't hurt
        anything.
      
        This has been in linux-next for a month or so"
      
      * tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: fix crash on reading version from proc after unregisted bmc
        ipmi/bt-bmc: remove redundant return value check of platform_get_resource()
        ipmi/bt-bmc: add a dependency on ARCH_ASPEED
        ipmi: Fix ioremap error handling in bt-bmc
        ipmi: add an Aspeed BT IPMI BMC driver
      5766e9d2
  4. 22 Oct, 2016 13 commits
  5. 21 Oct, 2016 9 commits