Skip to content
  1. Jul 28, 2017
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.13-rc3' of git://people.freedesktop.org/~airlied/linux · 0b5477d9
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "These iare the fixes for 4.13-rc3: vmwgfx, exynos, i915, amdgpu,
        nouveau, host1x and displayport fixes.
      
        As expected people woke up this week, i915 didn't do an -rc2 pull so
        got a bumper -rc3 pull, and Ben resurfaced on nouveau and fixed a
        bunch of major crashers seen on Fedora 26, and there are a few vmwgfx
        fixes as well.
      
        Otherwise exynos had some regression fixes/cleanups, and amdgpu has an
        rcu locking regression fix and a couple of minor fixes"
      
      * tag 'drm-fixes-for-v4.13-rc3' of git://people.freedesktop.org/~airlied/linux: (44 commits)
        drm/i915: Fix bad comparison in skl_compute_plane_wm.
        drm/i915: Force CPU synchronisation even if userspace requests ASYNC
        drm/i915: Only skip updating execobject.offset after error
        drm/i915: Only mark the execobject as pinned on success
        drm/i915: Remove assertion from raw __i915_vma_unpin()
        drm/i915/cnl: Fix loadgen select programming on ddi vswing sequence
        drm/i915: Fix scaler init during CRTC HW state readout
        drm/i915/selftests: Fix an error handling path in 'mock_gem_device()'
        drm/i915: Unbreak gpu reset vs. modeset locking
        gpu: host1x: Free the IOMMU domain when there is no device to attach
        drm/i915: Fix cursor updates on some platforms
        drm/i915: Fix user ptr check size in eb_relocate_vma()
        drm: exynos: mark pm functions as __maybe_unused
        drm/exynos: select CEC_CORE if CEC_NOTIFIER
        drm/exynos/hdmi: fix disable sequence
        drm/exynos: mic: add a bridge at probe
        drm/exynos/dsi: Remove error handling for bridge_node DT parsing
        drm/exynos: dsi: do not try to find bridge
        drm: exynos: hdmi: make of_device_ids const.
        drm: exynos: constify mixer_match_types and *_mxr_drv_data.
        ...
      0b5477d9
    • Dave Airlie's avatar
      Merge tag 'exynos-drm-fixes-for-v4.13-rc3' of... · 20806588
      Dave Airlie authored
      Merge tag 'exynos-drm-fixes-for-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
      
      Summary:
      - fix probing fail issue of dsi driver without bridge device.
      - fix disable sequence of hdmi driver.
      - trivial cleanups.
      
      * tag 'exynos-drm-fixes-for-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm: exynos: mark pm functions as __maybe_unused
        drm/exynos: select CEC_CORE if CEC_NOTIFIER
        drm/exynos/hdmi: fix disable sequence
        drm/exynos: mic: add a bridge at probe
        drm/exynos/dsi: Remove error handling for bridge_node DT parsing
        drm/exynos: dsi: do not try to find bridge
        drm: exynos: hdmi: make of_device_ids const.
        drm: exynos: constify mixer_match_types and *_mxr_drv_data.
        exynos_drm: Clean up duplicated assignment in exynos_drm_driver
      20806588
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2017-07-27' of... · d5bcd111
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2017-07-27' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
      
      i915 fixes for -rc3
      
      Bit more than usual since we missed -rc2. 4x cc: stable, 2 gvt
      patches, but all fairly minor stuff. Last minute rebase was to add a
      few missing cc: stable, I did prep the pull this morning already and
      made sure CI approves.
      
      * tag 'drm-intel-fixes-2017-07-27' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: Fix bad comparison in skl_compute_plane_wm.
        drm/i915: Force CPU synchronisation even if userspace requests ASYNC
        drm/i915: Only skip updating execobject.offset after error
        drm/i915: Only mark the execobject as pinned on success
        drm/i915: Remove assertion from raw __i915_vma_unpin()
        drm/i915/cnl: Fix loadgen select programming on ddi vswing sequence
        drm/i915: Fix scaler init during CRTC HW state readout
        drm/i915/selftests: Fix an error handling path in 'mock_gem_device()'
        drm/i915: Unbreak gpu reset vs. modeset locking
        drm/i915: Fix cursor updates on some platforms
        drm/i915: Fix user ptr check size in eb_relocate_vma()
        drm/i915/gvt: Extend KBL platform support in GVT-g
        drm/i915/gvt: Fix the vblank timer close issue after shutdown VMs in reverse
      d5bcd111
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2017-07-27' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes · 2213b666
      Dave Airlie authored
      Core Changes:
      - dp: A few fixes in drm_dp_downstream_debug() (Chris)
      - rockchip: sanitize the Kconfig dependencies (fallout from EXTCON) (Arnd)
      - host1x: Free the iommu domain when attach_device fails (Paul)
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Paul Kocialkowski <contact@paulk.fr>
      
      * tag 'drm-misc-fixes-2017-07-27' of git://anongit.freedesktop.org/git/drm-misc:
        gpu: host1x: Free the IOMMU domain when there is no device to attach
        drm/rockchip: fix Kconfig dependencies
        drm/dp: Don't trust drm_dp_downstream_id()
        drm/dp: Fix read pointer for drm_dp_downsteam_debug()
      2213b666
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0ce2f385
      Linus Torvalds authored
      Pull ACPI fixes from Rafael Wysocki:
       "These are two fixups for the suspend-to-idle handling in the ACPI
        subsystem after recent changes in that area and two simple fixes of
        the ACPI NUMA code.
      
        Specifics:
      
         - Add an ACPI module parameter to allow users to override the new
           default behavior on some systems where the EC GPE is not disabled
           during suspend-to-idle in case the EC on their systems generates
           excessive wakeup events and they want to sacrifice some
           functionality (like power button wakeups) for extra battery life
           while suspended (Rafael Wysocki).
      
         - Fix flushing of the outstanding EC work in the ACPI core
           suspend-to-idle code (Rafael Wysocki).
      
         - Add a missing include and fix a messed-up comment in the ACPI NUMA
           code (Ross Zwisler)"
      
      * tag 'acpi-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: NUMA: Fix typo in the full name of SRAT
        ACPI: NUMA: add missing include in acpi_numa.h
        ACPI / PM / EC: Flush all EC work in acpi_freeze_sync()
        ACPI / EC: Add parameter to force disable the GPE on suspend
      0ce2f385
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-pm' and 'acpi-numa' · f6248dd8
      Rafael J. Wysocki authored
      * acpi-pm:
        ACPI / PM / EC: Flush all EC work in acpi_freeze_sync()
        ACPI / EC: Add parameter to force disable the GPE on suspend
      
      * acpi-numa:
        ACPI: NUMA: Fix typo in the full name of SRAT
        ACPI: NUMA: add missing include in acpi_numa.h
      f6248dd8
    • Daniel Vetter's avatar
      Merge tag 'gvt-fixes-2017-07-26' of https://github.com/01org/gvt-linux into drm-intel-fixes · 5fe220a1
      Daniel Vetter authored
      
      
      gvt-fixes-2017-07-26
      
      - Turn on KBL support for more SKUs (Jianjun)
      - Fix vblank timer close bug (Fred)
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170726075621.hrauvik62gi2jecj@zhen-hp.sh.intel.com
      5fe220a1
    • Maarten Lankhorst's avatar
      drm/i915: Fix bad comparison in skl_compute_plane_wm. · e9ba4032
      Maarten Lankhorst authored
      
      
      ddb_allocation && ddb_allocation / blocks_per_line >= 1 is the same
      as ddb_allocation >= blocks_per_line, so use the latter to simplify
      this.
      
      This fixes the following compiler warning:
      
      drivers/gpu/drm/i915/intel_pm.c:4467]: (warning) Comparison of a
      boolean expression with an integer other than 0 or 1.
      
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Fixes: d555cb58
      
       ("drm/i915/skl+: use linetime latency if ddb size is not available")
      Cc: "Mahesh Kumar" <mahesh1.kumar@intel.com>
      Reported-by: default avatarDavid Binderman <dcb314@hotmail.com>
      Cc: David Binderman <dcb314@hotmail.com>
      Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.13-rc1+
      Reviewed-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
      (cherry picked from commit 54d20ed1
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170717111355.4523-1-maarten.lankhorst@linux.intel.com
      
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      e9ba4032
    • Chris Wilson's avatar
      drm/i915: Force CPU synchronisation even if userspace requests ASYNC · 7b98da66
      Chris Wilson authored
      The goal here was to minimise doing any thing or any check inside the
      kernel that was not strictly required. For a userspace that assumes
      complete control over the cache domains, the kernel is usually using
      outdated information and may trigger clflushes where none were
      required.
      
      However, swapping is a situation where userspace has no knowledge of the
      domain transfer, and will leave the object in the CPU cache. The kernel
      must flush this out to the backing storage prior to use with the GPU. As
      we use an asynchronous task tracked by an implicit fence for this, we
      also need to cancel the ASYNC flag on the object so that the object will
      wait for the clflush to complete before being executed. This also absolves
      userspace of the responsibility imposed by commit 77ae9957 ("drm/i915:
      Enable userspace to opt-out of implicit fencing") that its needed to ensure
      that the object was out of the CPU cache prior to use on the GPU.
      
      Fixes: 77ae9957 ("drm/i915: Enable userspace to opt-out of implicit fencing")
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101571
      
      
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Jason Ekstrand <jason@jlekstrand.net>
      Reviewed-by: default avatarJason Ekstrand <jason@jlekstrand.net>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170721145037.25105-5-chris@chris-wilson.co.uk
      
      
      Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit 0f46daa1
      
      )
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      7b98da66
    • Chris Wilson's avatar
      drm/i915: Only skip updating execobject.offset after error · adf27835
      Chris Wilson authored
      I was being overly paranoid in not updating the execobject.offset after
      performing the fallback copy where we set reloc.presumed_offset to -1.
      The thinking was to ensure that a subsequent NORELOC execbuf would be
      forced to process the invalid relocations. However this is overkill so
      long as we *only* update the execobject.offset following a successful
      update of the relocation value witin the batch. If we have to repeat the
      execbuf due to a later interruption, then we may skip the relocations on
      the second pass (honouring NORELOC) since the execobject.offset match
      the actual offsets (even though reloc.presumed_offset is garbage).
      
      Subsequent calls to execbuf with NORELOC should themselves ensure that
      the reloc.presumed_offset have been corrected in case of future
      migration.
      
      Reporting back the actual execobject.offset, even when
      reloc.presumed_offset is garbage, ensures that reuse of those objects
      use the latest information to avoid relocations.
      
      Fixes: 2889caa9 ("drm/i915: Eliminate lots of iterations over the execobjects array")
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101635
      
      
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170721145037.25105-4-chris@chris-wilson.co.uk
      
      
      Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit 1f727d9e
      
      )
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      adf27835
    • Chris Wilson's avatar
      drm/i915: Only mark the execobject as pinned on success · bed8d1c8
      Chris Wilson authored
      
      
      If we fail to acquire a fence (for old school fenced GPU access) then we
      unwind the vma reservation, including its pin. However, we were making
      the execobject as holding the pin before erring out, leading to a double
      unpin:
      
      [ 3193.991802] kernel BUG at drivers/gpu/drm/i915/i915_vma.h:287!
      [ 3193.998131] invalid opcode: 0000 [#1] PREEMPT SMP
      [ 3194.002816] Modules linked in: snd_hda_intel i915 vgem snd_hda_codec_analog snd_hda_codec_generic coretemp snd_hda_codec snd_hwdep snd_hda_core snd_pcm lpc_ich mei_me e1000e mei prime_numbers ptp pps_core [last unloaded: i915]
      [ 3194.022841] CPU: 0 PID: 8123 Comm: kms_flip Tainted: G     U          4.13.0-rc1-CI-CI_DRM_471+ #1
      [ 3194.031765] Hardware name: Dell Inc. OptiPlex 755                 /0PU052, BIOS A04 11/05/2007
      [ 3194.040343] task: ffff8800785d4c40 task.stack: ffffc90001768000
      [ 3194.046339] RIP: 0010:eb_release_vmas.isra.6+0x119/0x180 [i915]
      [ 3194.052234] RSP: 0018:ffffc9000176ba80 EFLAGS: 00010246
      [ 3194.057439] RAX: 00000000000003c0 RBX: ffff8800710fc2d8 RCX: ffff8800588e4f48
      [ 3194.064546] RDX: ffffffff1fffffff RSI: 00000000ffffffff RDI: ffff8800588e00d0
      [ 3194.071654] RBP: ffffc9000176bab0 R08: 0000000000000000 R09: 0000000000000000
      [ 3194.078761] R10: 0000000000000040 R11: 0000000000000001 R12: ffff880060822f00
      [ 3194.085867] R13: 0000000000000310 R14: 00000000000003b8 R15: ffffc9000176bbb0
      [ 3194.092975] FS:  00007fd2b94aba40(0000) GS:ffff88007d200000(0000) knlGS:0000000000000000
      [ 3194.101033] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [ 3194.106754] CR2: 00007ffbec3ff000 CR3: 0000000074e67000 CR4: 00000000000006f0
      [ 3194.113861] Call Trace:
      [ 3194.116321]  eb_relocate_slow+0x67/0x4e0 [i915]
      [ 3194.120861]  i915_gem_do_execbuffer+0x429/0x1260 [i915]
      [ 3194.126070]  ? lock_acquire+0xb5/0x210
      [ 3194.129803]  ? __might_fault+0x39/0x90
      [ 3194.133563]  i915_gem_execbuffer2+0x9b/0x1b0 [i915]
      [ 3194.138447]  ? i915_gem_execbuffer+0x2b0/0x2b0 [i915]
      [ 3194.143478]  drm_ioctl_kernel+0x64/0xb0
      [ 3194.147298]  drm_ioctl+0x2cd/0x390
      [ 3194.150710]  ? i915_gem_execbuffer+0x2b0/0x2b0 [i915]
      [ 3194.155741]  ? finish_task_switch+0xa5/0x210
      [ 3194.159993]  ? finish_task_switch+0x6a/0x210
      [ 3194.164247]  do_vfs_ioctl+0x90/0x670
      [ 3194.167806]  ? entry_SYSCALL_64_fastpath+0x5/0xb1
      [ 3194.172492]  ? __this_cpu_preempt_check+0x13/0x20
      [ 3194.177176]  ? trace_hardirqs_on_caller+0xe7/0x1c0
      [ 3194.181946]  SyS_ioctl+0x3c/0x70
      [ 3194.185159]  entry_SYSCALL_64_fastpath+0x1c/0xb1
      [ 3194.189756] RIP: 0033:0x7fd2b76a8587
      [ 3194.193314] RSP: 002b:00007fff074845b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
      [ 3194.200855] RAX: ffffffffffffffda RBX: ffffffff8146da43 RCX: 00007fd2b76a8587
      [ 3194.207962] RDX: 00007fff074846e0 RSI: 0000000040406469 RDI: 0000000000000003
      [ 3194.215068] RBP: ffffc9000176bf88 R08: 0000000000000000 R09: 0000000000000003
      [ 3194.222175] R10: 00007fd2b796bb58 R11: 0000000000000246 R12: 00007fff07484880
      [ 3194.229280] R13: 0000000000000003 R14: 0000000040406469 R15: 0000000000000000
      [ 3194.236386]  ? __this_cpu_preempt_check+0x13/0x20
      [ 3194.241070] Code: 24 b0 00 00 00 48 85 c9 0f 84 6c ff ff ff 8b 41 20 85 c0 7e 73 83 e8 01 89 41 20 41 8b 84 24 e8 00 00 00 a8 0f 0f 85 5f ff ff ff <0f> 0b 48 83 c4 08 5b 41 5c 41 5d 41 5e 41 5f 5d f3 c3 49 8b 84
      [ 3194.259943] RIP: eb_release_vmas.isra.6+0x119/0x180 [i915] RSP: ffffc9000176ba80
      [ 3194.268047] ---[ end trace 1d7348c6575d8800 ]---
      [ 3673.658819] softdog: Initiating panic
      [ 3673.662471] Kernel panic - not syncing: Software Watchdog Timer expired
      [ 3673.669066] Kernel Offset: disabled
      [ 3673.672541] Rebooting in 1 seconds..
      
      Reported-by: default avatarTomi Sarvela <tomi.p.sarvela@intel.com>
      Fixes: 2889caa9
      
       ("drm/i915: Eliminate lots of iterations over the execobjects array")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170721145037.25105-3-chris@chris-wilson.co.uk
      
      
      Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit 1da7b54c
      
      )
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      bed8d1c8
    • Chris Wilson's avatar
      drm/i915: Remove assertion from raw __i915_vma_unpin() · a6c00779
      Chris Wilson authored
      After we detect a i915_vma pin overflow, we call __i915_vma_unpin to
      cleanup. However, on an overflow the pin_count bitfield will be zero,
      triggering an assertion, even though we the intention is to merely warn
      and report the error back to the user (as historically the culprit has
      be a leak in the display code).
      
      Fixes: 20dfbde4
      
       ("drm/i915: Wrap vma->pin_count accessors with small inline helpers")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170721145037.25105-2-chris@chris-wilson.co.uk
      
      
      Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit 67fddd90
      
      )
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a6c00779
    • Navare, Manasi D's avatar
      drm/i915/cnl: Fix loadgen select programming on ddi vswing sequence · 5846a73f
      Navare, Manasi D authored
      The condition for setting the Loadgen Select bit of
      PORT_TX_DW4 register during DDI Vswing Sequence should be
      Bit rate <=6 GHz whereas the existing code checks only
      Bit Rate < 6GHz. This patch fixes this condition.
      While at it also remove the redundant paranthesis.
      
      Fixes: cf54ca8b
      
       ("drm/i915/cnl: Implement voltage swing sequence.")
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
      Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/1500329122-32662-1-git-send-email-manasi.d.navare@intel.com
      
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit a8e45a1c
      
      )
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      5846a73f
    • Imre Deak's avatar
      drm/i915: Fix scaler init during CRTC HW state readout · 283d6860
      Imre Deak authored
      
      
      The scaler allocation code depends on a non-zero default value for the
      crtc scaler_id, so make sure we initialize the scaler state accordingly
      even if the crtc is off. This fixes at least an initial YUV420 modeset
      (added in a follow-up patchset by Shashank) when booting with the screen
      off: after the initial HW readout and modeset which enables the scaler a
      subsequent modeset will disable the scaler which isn't properly
      allocated. This results in a funky HW state where the pipe scaler HW
      registers can't be modified and the normally black screen is grey and
      shifted to the right or jitters.
      
      The problem was revealed by Shashank's YUV420 patchset and first
      reported by Ville.
      
      v2:
      - In the stable tag also include versions which need backporting (Jani)
      
      Cc: Jani Nikula <jani.nikula@intel.com>
      Cc: Shashank Sharma <shashank.sharma@intel.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Chandra Konduru <chandra.konduru@intel.com>
      Cc: Matt Roper <matthew.d.roper@intel.com>
      Cc: <stable@vger.kernel.org> # 4.2.x
      Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Fixes: a1b2278e
      
       ("drm/i915: skylake panel fitting using shared scalers")
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Reviewed-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170720112820.26816-1-imre.deak@intel.com
      
      
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      (cherry picked from commit 5fb9dadf
      
      )
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      283d6860
    • Christophe JAILLET's avatar
      drm/i915/selftests: Fix an error handling path in 'mock_gem_device()' · 3d911425
      Christophe JAILLET authored
      Goto the right label in case of error, otherwise there is a leak.
      This has been introduced by c5cf9a91. In this patch a goto has not been
      updated.
      
      Fixes: c5cf9a91
      
       ("drm/i915: Create a kmem_cache to allocate struct i915_priolist from")
      Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170719223503.30580-1-christophe.jaillet@wanadoo.fr
      
      
      Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      (cherry picked from commit a5ec7fe8
      
      )
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      3d911425
    • Daniel Vetter's avatar
      drm/i915: Unbreak gpu reset vs. modeset locking · 4706ca77
      Daniel Vetter authored
      Taking the modeset locks unconditionally isn't the greatest idea,
      because atm that part is still broken and times out (and then atomic
      keels over). And there's really no reason to do so, the old code
      didn't do that either.
      
      To make the patch a bit simpler let's also nuke 2 cases that are only
      around for the old mmioflip paths. Atomic nonblocking workers will not
      die (minus bugs) when a gpu reset happens.
      
      And of course this doesn't fix any of the gpu reset vs. modeset
      deadlock fun, but it at least stop modern CI machines from keeling
      over all over the place for no reason at all.
      
      And we still have the explicit testcases to run the fake gpu reset, so
      coverage isn't that much worse.
      
      v2: Split out additional changes on top, restrict this to purely reducing
      the critical section of modeset locks.
      
      v2: Review from Maarten
      - update comments
      - don't oops when state is NULL in intel_finish_reset, but try to at
        least still drop locks properly. The hw is going to be toast anyway.
      
      Fixes: 73974893
      
       ("drm/i915: Fix modeset handling during gpu reset, v5.")
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20170719125502.25696-3-daniel.vetter@ffwll.ch
      (cherry picked from commit ce87ea15
      
      )
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      4706ca77
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 36cb531d
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
      
       - The majority of lines changed are due to regenerated defconfig files.
      
       - The support for the Page Deallocation Table (PDT) which was merged in
         the merge window for 4.13 contained a bug which crashes the kernel if
         a bad page is reported by firmware. This is now fixed and the kernel
         messages will show which memory slot holds the broken DIMM.
      
       - Commit 3a166fc2 ("kbuild: handle libs-y archives separately from
         built-in.o archives") broke linking the parisc kernel due to
         millicode symbols which can't be reached then any longer. This was
         fixed by modifying the parisc vmlinux.lds linker script.
      
       - If the stack checker panics on stack overflow, avoid recursive
         panics.
      
       - Some parisc machines can't physically power off and thus instead
         start after some time to flood the console by presumably detected
         soft lockups. Avoid this by disabling the lockup detectors before
         entering the endless for-next loop.
      
       - Dave Anglin provided fixes which prevents TLB speculation on flushed
         pages on PA8800/PA9000 CPUs.
      
       - Arvind Yadav sent a trivial patch to constify the attribute_group
         structure in our firmware on-board-flash storage driver
         (pdc_stable.c)
      
      * 'parisc-4.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Extend disabled preemption in copy_user_page
        parisc: Prevent TLB speculation on flushed pages on CPUs that only support equivalent aliases
        parisc: Suspend lockup detectors before system halt
        parisc: Show DIMM slot number which holds broken memory module
        parisc: Add function to return DIMM slot of physical address
        parisc: Fix crash when calling PDC_PAT_MEM PDT firmware function
        parisc: regenerate defconfig files
        parisc: pdc_stable: constify attribute_group structures.
        parisc: Merge millicode routines via linker script
        parisc: Disable further stack checks when panic occurs during stack check
      36cb531d
    • Linus Torvalds's avatar
      Merge tag 'sound-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 8cdaad96
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This is a pretty boring pull request, containing a few HD-audio quirks
        and ID updates as usual suspects, as well as a fix for a regression of
        FM801 chip on ia64 (what a legacy combination!)"
      
      * tag 'sound-4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add mute led support for HP ProBook 440 G4
        ALSA: hda/realtek - No loopback on ALC225/ALC295 codec
        ALSA: hda/realtek - Update headset mode for ALC225
        ALSA: fm801: Initialize chip after IRQ handler is registered
        ALSA: hda/realtek - Update headset mode for ALC298
        ALSA: hda - Add missing NVIDIA GPU codec IDs to patch table
      8cdaad96
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · 60187bd4
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Two areas addressed by these fixes:
      
         - Fixes from Dave Martin for the signal frames that were broken with
           certain configurations. No one noticed until recently.
      
         - More kexec fixes to ensure that the crashkernel region is correctly
           allocated, and a fix for the location of the device tree when
           several kexec kernels are loaded"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[]
        ARM: 8686/1: iwmmxt: Add missing __user annotations to sigframe accessors
        ARM: kexec: fix failure to boot crash kernel
        ARM: kexec: avoid allocating crashkernel region outside lowmem
      60187bd4
  2. Jul 27, 2017
  3. Jul 26, 2017