1. 14 Feb, 2016 1 commit
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2016-02-12' of git://anongit.freedesktop.org/drm-intel into drm-fixes · bdbe58e6
      Dave Airlie authored
      i915 display fixes mostly.
      
      * tag 'drm-intel-fixes-2016-02-12' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: fix error path in intel_setup_gmbus()
        drm/i915/skl: Fix typo in DPLL_CFGCR1 definition
        drm/i915/skl: Don't skip mst encoders in skl_ddi_pll_select()
        drm/i915: Pretend cursor is always on for ILK-style WM calculations (v2)
        drm/i915/dp: reduce missing TPS3 support errors to debug logging
        drm/i915/dp: abstract training pattern selection
        drm/i915/dsi: skip gpio element execution when not supported
        drm/i915/dsi: don't pass arbitrary data to sideband
        drm/i915/dsi: defend gpio table against out of bounds access
        drm/i915/bxt: Don't save/restore eDP panel power during suspend (v3)
        drm/i915: Allow i915_gem_object_get_page() on userptr as well
      bdbe58e6
  2. 10 Feb, 2016 9 commits
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · c92a428f
      Dave Airlie authored
      radeon and amdgpu fixes for 4.5.  Highlights:
      - powerplay fixes for amdgpu
      - race fixes in the sub-allocator in radeon and amdgpu
      - hibernate fix for amdgpu
      - fix a possible circular locking in userptr handling in amdgpu
      
      * 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux: (21 commits)
        drm/amdgpu: fix issue with overlapping userptrs
        drm/radeon: hold reference to fences in radeon_sa_bo_new
        drm/amdgpu: remove unnecessary forward declaration
        drm/amdgpu: hold reference to fences in amdgpu_sa_bo_new (v2)
        drm/amdgpu: fix s4 resume
        drm/amdgpu/cz: plumb pg flags through to powerplay
        drm/amdgpu/tonga: plumb pg flags through to powerplay
        drma/dmgpu: move cg and pg flags into shared headers
        drm/amdgpu: remove unused cg defines
        drm/amdgpu: add a cgs interface to fetch cg and pg flags
        drm/amd/powerplay/tonga: disable vce pg
        drm/amd/powerplay/tonga: disable uvd pg
        drm/amd/powerplay/cz: disable vce pg
        drm/amd/powerplay/cz: disable uvd pg
        drm/amdgpu: be consistent with uvd cg flags
        drm/amdgpu: clean up vce pg flags for cz/st
        drm/amdgpu: handle vce pg flags properly
        drm/amdgpu: handle uvd pg flags properly
        drm/amdgpu/dpm/ci: switch over to the common pcie caps interface
        drm/amdgpu/cik: don't mess with aspm if gpu is root bus
        ...
      c92a428f
    • Christian König's avatar
      drm/amdgpu: fix issue with overlapping userptrs · cc1de6e8
      Christian König authored
      Otherwise we could try to evict overlapping userptr BOs in get_user_pages(),
      leading to a possible circular locking dependency.
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      cc1de6e8
    • Nicolai Hähnle's avatar
      drm/radeon: hold reference to fences in radeon_sa_bo_new · f6ff4f67
      Nicolai Hähnle authored
      An arbitrary amount of time can pass between spin_unlock and
      radeon_fence_wait_any, so we need to ensure that nobody frees the
      fences from under us.
      
      Based on the analogous fix for amdgpu.
      Signed-off-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Cc: stable@vger.kernel.org
      f6ff4f67
    • Nicolai Hähnle's avatar
      b19763d0
    • Nicolai Hähnle's avatar
      drm/amdgpu: hold reference to fences in amdgpu_sa_bo_new (v2) · a8d81b36
      Nicolai Hähnle authored
      An arbitrary amount of time can pass between spin_unlock and
      fence_wait_any_timeout, so we need to ensure that nobody frees the
      fences from under us.
      
      A stress test (rapidly starting and killing hundreds of glxgears
      instances) ran into a deadlock in fence_wait_any_timeout after
      about an hour, and this race condition appears to be a plausible
      cause.
      
      v2: agd: rebase on upstream
      Signed-off-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Cc: stable@vger.kernel.org
      a8d81b36
    • Flora Cui's avatar
      drm/amdgpu: fix s4 resume · ca198528
      Flora Cui authored
      No need to re-init asic if it's already been initialized.
      Skip IB tests since kernel processes are frozen in thaw.
      Signed-off-by: default avatarFlora Cui <Flora.Cui@amd.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      ca198528
    • Rasmus Villemoes's avatar
      drm/i915: fix error path in intel_setup_gmbus() · ed3f9fd1
      Rasmus Villemoes authored
      This fails to undo the setup for pin==0; moreover, something
      interesting happens if the setup failed already at pin==0.
      Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
      Fixes: f899fc64 ("drm/i915: use GMBUS to manage i2c links")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1455048677-19882-3-git-send-email-linux@rasmusvillemoes.dk
      (cherry picked from commit 2417c8c0)
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      ed3f9fd1
    • Lyude's avatar
      drm/i915/skl: Fix typo in DPLL_CFGCR1 definition · 39748841
      Lyude authored
      We accidentally point both cfgcr registers for the second shared DPLL to
      the same location in i915_reg.h. This results in a lot of hw pipe state
      mismatches whenever we try to do a modeset that requires allocating the
      DPLL to a CRTC:
      
      [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in dpll_hw_state.cfgcr1 (expected 0x80000168, found 0x000004a5)
      [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in base.adjusted_mode.crtc_clock (expected 108000, found 49500)
      [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in port_clock (expected 108000, found 49500)
      
      This usually ends up causing blank monitors, since the DPLL never can
      get set to the right clock.
      
      Fixes: 086f8e84 ("drm/i915: Prefix raw register defines with underscore")
      Signed-off-by: default avatarLyude <cpaul@redhat.com>
      Cc: drm-intel-fixes@lists.freedesktop.org
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/1454600601-21900-1-git-send-email-cpaul@redhat.com
      (cherry picked from commit da3b891b)
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      39748841
    • Lyude's avatar
      drm/i915/skl: Don't skip mst encoders in skl_ddi_pll_select() · 3d849b02
      Lyude authored
      We don't actually check for INTEL_OUTPUT_DP_MST at all in here, as a
      result we skip assigning a DPLL to any DP MST ports, which makes link
      training fail:
      
      [ 1442.933896] [drm:intel_power_well_enable] enabling DDI D power well
      [ 1442.933905] [drm:skl_set_power_well] Enabling DDI D power well
      [ 1442.933957] [drm:intel_mst_pre_enable_dp] 0
      [ 1442.935474] [drm:intel_dp_set_signal_levels] Using signal levels 00000000
      [ 1442.935477] [drm:intel_dp_set_signal_levels] Using vswing level 0
      [ 1442.935480] [drm:intel_dp_set_signal_levels] Using pre-emphasis level 0
      [ 1442.936190] [drm:intel_dp_set_signal_levels] Using signal levels 05000000
      [ 1442.936193] [drm:intel_dp_set_signal_levels] Using vswing level 1
      [ 1442.936195] [drm:intel_dp_set_signal_levels] Using pre-emphasis level 1
      [ 1442.936858] [drm:intel_dp_set_signal_levels] Using signal levels 08000000
      [ 1442.936862] [drm:intel_dp_set_signal_levels] Using vswing level 2
      …
      [ 1442.998253] [drm:intel_dp_link_training_clock_recovery [i915]] *ERROR* too many full retries, give up
      [ 1442.998512] [drm:intel_dp_start_link_train [i915]] *ERROR* failed to train DP, aborting
      
      After which the pipe state goes completely out of sync:
      
      [   70.075596] [drm:check_crtc_state] [CRTC:25]
      [   70.075696] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in ddi_pll_sel (expected 0x00000000, found 0x00000001)
      [   70.075747] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in shared_dpll (expected -1, found 0)
      [   70.075798] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in dpll_hw_state.ctrl1 (expected 0x00000000, found 0x00000021)
      [   70.075840] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in dpll_hw_state.cfgcr1 (expected 0x00000000, found 0x80400173)
      [   70.075884] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in dpll_hw_state.cfgcr2 (expected 0x00000000, found 0x000003a5)
      [   70.075954] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in base.adjusted_mode.crtc_clock (expected 262750, found 72256)
      [   70.075999] [drm:intel_pipe_config_compare [i915]] *ERROR* mismatch in port_clock (expected 540000, found 148500)
      
      And if you're especially lucky, it keeps going downhill:
      
      [   83.309256] Kernel panic - not syncing: Timeout: Not all CPUs entered broadcast exception handler
      [   83.309265]
      [   83.309265] =================================
      [   83.309266] [ INFO: inconsistent lock state ]
      [   83.309267] 4.5.0-rc1Lyude-Test #265 Not tainted
      [   83.309267] ---------------------------------
      [   83.309268] inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
      [   83.309270] Xorg/1194 [HC0[1]:SC0[0]:HE1:SE1] takes:
      [   83.309293]  (&(&dev_priv->uncore.lock)->rlock){?.-...}, at: [<ffffffffa02a6073>] gen9_write32+0x63/0x400 [i915]
      [   83.309293] {IN-HARDIRQ-W} state was registered at:
      [   83.309297]   [<ffffffff810e84f4>] __lock_acquire+0x9c4/0x1d00
      [   83.309299]   [<ffffffff810ea1be>] lock_acquire+0xce/0x1c0
      [   83.309302]   [<ffffffff8177d936>] _raw_spin_lock_irqsave+0x56/0x90
      [   83.309321]   [<ffffffffa02a5492>] gen9_read32+0x52/0x3d0 [i915]
      [   83.309332]   [<ffffffffa024beea>] gen8_irq_handler+0x27a/0x6a0 [i915]
      [   83.309337]   [<ffffffff810fdbc1>] handle_irq_event_percpu+0x41/0x300
      [   83.309339]   [<ffffffff810fdeb9>] handle_irq_event+0x39/0x60
      [   83.309341]   [<ffffffff811010b4>] handle_edge_irq+0x74/0x130
      [   83.309344]   [<ffffffff81009073>] handle_irq+0x73/0x120
      [   83.309346]   [<ffffffff817805f1>] do_IRQ+0x61/0x120
      [   83.309348]   [<ffffffff8177e6d6>] ret_from_intr+0x0/0x20
      [   83.309351]   [<ffffffff815f5105>] cpuidle_enter_state+0x105/0x330
      [   83.309353]   [<ffffffff815f5367>] cpuidle_enter+0x17/0x20
      [   83.309356]   [<ffffffff810dbe1a>] call_cpuidle+0x2a/0x50
      [   83.309358]   [<ffffffff810dc1dd>] cpu_startup_entry+0x26d/0x3a0
      [   83.309360]   [<ffffffff817701da>] rest_init+0x13a/0x140
      [   83.309363]   [<ffffffff81f2af8e>] start_kernel+0x475/0x482
      [   83.309365]   [<ffffffff81f2a315>] x86_64_start_reservations+0x2a/0x2c
      [   83.309367]   [<ffffffff81f2a452>] x86_64_start_kernel+0x13b/0x14a
      
      Fixes: 82d35437 ("drm/i915/skl: Implementation of SKL DPLL programming")
      Signed-off-by: default avatarLyude <cpaul@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: http://patchwork.freedesktop.org/patch/msgid/1454428183-994-1-git-send-email-cpaul@redhat.com
      (cherry picked from commit 78385cb3)
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      3d849b02
  3. 09 Feb, 2016 1 commit
  4. 08 Feb, 2016 23 commits
  5. 07 Feb, 2016 5 commits
    • Linus Torvalds's avatar
      Linux 4.5-rc3 · 388f7b1d
      Linus Torvalds authored
      388f7b1d
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c17dfb01
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "The first real batch of fixes for this release cycle, so there are a
        few more than usual.
      
        Most of these are fixes and tweaks to board support (DT bugfixes,
        etc).  I've also picked up a couple of small cleanups that seemed
        innocent enough that there was little reason to wait (const/
        __initconst and Kconfig deps).
      
        Quite a bit of the changes on OMAP were due to fixes to no longer
        write to rodata from assembly when ARM_KERNMEM_PERMS was enabled, but
        there were also other fixes.
      
        Kirkwood had a bunch of gpio fixes for some boards.  OMAP had RTC
        fixes on OMAP5, and Nomadik had changes to MMC parameters in DT.
      
        All in all, mostly the usual mix of various fixes"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits)
        ARM: multi_v7_defconfig: enable DW_WATCHDOG
        ARM: nomadik: fix up SD/MMC DT settings
        ARM64: tegra: Add chosen node for tegra132 norrin
        ARM: realview: use "depends on" instead of "if" after prompt
        ARM: tango: use "depends on" instead of "if" after prompt
        ARM: tango: use const and __initconst for smp_operations
        ARM: realview: use const and __initconst for smp_operations
        bus: uniphier-system-bus: revive tristate prompt
        arm64: dts: Add missing DMA Abort interrupt to Juno
        bus: vexpress-config: Add missing of_node_put
        ARM: dts: am57xx: sbc-am57x: correct Eth PHY settings
        ARM: dts: am57xx: cl-som-am57x: fix CPSW EMAC pinmux
        ARM: dts: am57xx: sbc-am57x: fix UART3 pinmux
        ARM: dts: am57xx: cl-som-am57x: update SPI Flash frequency
        ARM: dts: am57xx: cl-som-am57x: set HOST mode for USB2
        ARM: dts: am57xx: sbc-am57x: fix SB-SOM EEPROM I2C address
        ARM: dts: LogicPD Torpedo: Revert Duplicative Entries
        ARM: dts: am437x: pixcir_tangoc: use correct flags for irq types
        ARM: dts: am4372: fix irq type for arm twd and global timer
        ARM: dts: at91: sama5d4 xplained: fix phy0 IRQ type
        ...
      c17dfb01
    • Linus Torvalds's avatar
      Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 63fee123
      Linus Torvalds authored
      Pull mailbox fixes from Jassi Brar:
      
       - fix getting element from the pcc-channels array by simply indexing
         into it
      
       - prevent building mailbox-test driver for archs that don't have IOMEM
      
      * 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: Fix dependencies for !HAS_IOMEM archs
        mailbox: pcc: fix channel calculation in get_pcc_channel()
      63fee123
    • Linus Torvalds's avatar
      Merge tag 'usb-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 46df55ce
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB fixes for 4.5-rc3.
      
        The usual, xhci fixes for reported issues, combined with some small
        gadget driver fixes, and a MAINTAINERS file update.  All have been in
        linux-next with no reported issues"
      
      * tag 'usb-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        xhci: harden xhci_find_next_ext_cap against device removal
        xhci: Fix list corruption in urb dequeue at host removal
        usb: host: xhci-plat: fix NULL pointer in probe for device tree case
        usb: xhci-mtk: fix AHB bus hang up caused by roothubs polling
        usb: xhci-mtk: fix bpkts value of LS/HS periodic eps not behind TT
        usb: xhci: apply XHCI_PME_STUCK_QUIRK to Intel Broxton-M platforms
        usb: xhci: set SSIC port unused only if xhci_suspend succeeds
        usb: xhci: add a quirk bit for ssic port unused
        usb: xhci: handle both SSIC ports in PME stuck quirk
        usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.
        Revert "xhci: don't finish a TD if we get a short-transfer event mid TD"
        MAINTAINERS: fix my email address
        usb: dwc2: Fix probe problem on bcm2835
        Revert "usb: dwc2: Move reset into dwc2_get_hwparams()"
        usb: musb: ux500: Fix NULL pointer dereference at system PM
        usb: phy: mxs: declare variable with initialized value
        usb: phy: msm: fix error handling in probe.
      46df55ce
    • Linus Torvalds's avatar
      Merge tag 'staging-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · dacd53c8
      Linus Torvalds authored
      Pull staging and IIO driver fixes from Greg KH:
       "Here are some IIO and staging driver fixes for 4.5-rc3.
      
        All of them, except one, are for IIO drivers, and one is for a speakup
        driver fix caused by some earlier patches, to resolve a reported build
        failure"
      
      * tag 'staging-4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        Staging: speakup: Fix allyesconfig build on mn10300
        iio: dht11: Use boottime
        iio: ade7753: avoid uninitialized data
        iio: pressure: mpl115: fix temperature offset sign
        iio: imu: Fix dependencies for !HAS_IOMEM archs
        staging: iio: Fix dependencies for !HAS_IOMEM archs
        iio: adc: Fix dependencies for !HAS_IOMEM archs
        iio: inkern: fix a NULL dereference on error
        iio:adc:ti_am335x_adc Fix buffered mode by identifying as software buffer.
        iio: light: acpi-als: Report data as processed
        iio: dac: mcp4725: set iio name property in sysfs
        iio: add HAS_IOMEM dependency to VF610_ADC
        iio: add IIO_TRIGGER dependency to STK8BA50
        iio: proximity: lidar: correct return value
        iio-light: Use a signed return type for ltr501_match_samp_freq()
      dacd53c8
  6. 06 Feb, 2016 1 commit
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 5af9c2e1
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "22 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
        epoll: restrict EPOLLEXCLUSIVE to POLLIN and POLLOUT
        radix-tree: fix oops after radix_tree_iter_retry
        MAINTAINERS: trim the file triggers for ABI/API
        dax: dirty inode only if required
        thp: make deferred_split_scan() work again
        mm: replace vma_lock_anon_vma with anon_vma_lock_read/write
        ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup
        um: asm/page.h: remove the pte_high member from struct pte_t
        mm, hugetlb: don't require CMA for runtime gigantic pages
        mm/hugetlb: fix gigantic page initialization/allocation
        mm: downgrade VM_BUG in isolate_lru_page() to warning
        mempolicy: do not try to queue pages from !vma_migratable()
        mm, vmstat: fix wrong WQ sleep when memory reclaim doesn't make any progress
        vmstat: make vmstat_update deferrable
        mm, vmstat: make quiet_vmstat lighter
        mm/Kconfig: correct description of DEFERRED_STRUCT_PAGE_INIT
        memblock: don't mark memblock_phys_mem_size() as __init
        dump_stack: avoid potential deadlocks
        mm: validate_mm browse_rb SMP race condition
        m32r: fix build failure due to SMP and MMU
        ...
      5af9c2e1