From: <gregkh@linuxfoundation.org>
To: gregkh@linuxfoundation.org, chris@chris-wilson.co.uk,
daniel@ffwll.ch, jani.nikula@intel.com,
peter.fruehberger@gmail.com, ville.syrjala@linux.intel.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "Revert "drm/i915: Exit cherryview_irq_handler() after one pass"" has been added to the 4.6-stable tree
Date: Wed, 22 Jun 2016 15:25:52 -0700 [thread overview]
Message-ID: <146663435223216@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
Revert "drm/i915: Exit cherryview_irq_handler() after one pass"
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 95654a3ae9b08840d57ecf79901fe88111567b62 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 22 Jun 2016 15:23:03 -0700
Subject: Revert "drm/i915: Exit cherryview_irq_handler() after one pass"
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This reverts commit 9dbaab56ac09f07a73fe83bf69bec3e31060080a.
Turns out it was a bad idea and was fixed up "properly" in 4.7 but those
patches are too big to put into 4.6, so let's just revert it for now.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Peter Frühberger <peter.fruehberger@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
---
drivers/gpu/drm/i915/i915_irq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1829,7 +1829,7 @@ static irqreturn_t cherryview_irq_handle
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
disable_rpm_wakeref_asserts(dev_priv);
- do {
+ for (;;) {
master_ctl = I915_READ(GEN8_MASTER_IRQ) & ~GEN8_MASTER_IRQ_CONTROL;
iir = I915_READ(VLV_IIR);
@@ -1857,7 +1857,7 @@ static irqreturn_t cherryview_irq_handle
I915_WRITE(GEN8_MASTER_IRQ, DE_MASTER_IRQ_CONTROL);
POSTING_READ(GEN8_MASTER_IRQ);
- } while (0);
+ }
enable_rpm_wakeref_asserts(dev_priv);
Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are
queue-4.6/tipc-check-nl-sock-before-parsing-nested-attributes.patch
queue-4.6/arm64-provide-model-name-in-proc-cpuinfo-for-per_linux32-tasks.patch
queue-4.6/proc-prevent-stacking-filesystems-on-top.patch
queue-4.6/l2tp-fix-configuration-passed-to-setup_udp_tunnel_sock.patch
queue-4.6/netlink-fix-dump-skb-leak-double-free.patch
queue-4.6/net-stmmac-fix-incorrect-memcpy-source-memory.patch
queue-4.6/kvm-x86-fix-oops-after-invalid-kvm_set_debugregs.patch
queue-4.6/gpiolib-fix-unaligned-used-of-reference-counters.patch
queue-4.6/tuntap-correctly-wake-up-process-during-uninit.patch
queue-4.6/sched-panic-on-corrupted-stack-end.patch
queue-4.6/netfilter-x_tables-add-and-use-xt_check_entry_offsets.patch
queue-4.6/sparc64-take-ctx_alloc_lock-properly-in-hugetlb_setup.patch
queue-4.6/macsec-fix-netlink-attribute-for-key-id.patch
queue-4.6/scsi_lib-correctly-retry-failed-zero-length-req_type_fs-commands.patch
queue-4.6/ipv4-fix-non-initialized-ttl-when-config_sysctl-n.patch
queue-4.6/netfilter-x_tables-assert-minimum-target-size.patch
queue-4.6/mm-thp-broken-page-count-after-commit-aa88b68c3b1d.patch
queue-4.6/ipv6-skip-xfrm-lookup-if-dst_entry-in-socket-cache-is-valid.patch
queue-4.6/netfilter-x_tables-add-compat-version-of-xt_check_entry_offsets.patch
queue-4.6/irqchip-gic-v3-fix-icc_sgi1r_el1.intid-decoding-mask.patch
queue-4.6/gpio-bcm-kona-fix-bcm_kona_gpio_reset-warnings.patch
queue-4.6/drm-core-do-not-preserve-framebuffer-on-rmfb-v4.patch
queue-4.6/crypto-public_key-select-crypto_akcipher.patch
queue-4.6/arm-fix-ptrace_setvfpregs-on-smp-systems.patch
queue-4.6/netfilter-x_tables-check-for-bogus-target-offset.patch
queue-4.6/sparc-harden-signal-return-frame-checks.patch
queue-4.6/crypto-ccp-fix-aes-xts-error-for-request-sizes-above-4096.patch
queue-4.6/powerpc-fix-definition-of-siar-and-sdar-registers.patch
queue-4.6/wext-fix-32-bit-iwpriv-compatibility-issue-with-64-bit-kernel.patch
queue-4.6/bpf-inode-disallow-userns-mounts.patch
queue-4.6/ecryptfs-forbid-opening-files-without-mmap-handler.patch
queue-4.6/net-nps_enet-disable-interrupts-before-napi-reschedule.patch
queue-4.6/netfilter-x_tables-validate-targets-of-jumps.patch
queue-4.6/drivers-perf-arm_pmu-defer-the-setting-of-__oprofile_cpu_pmu.patch
queue-4.6/gpiolib-fix-null-pointer-deference.patch
queue-4.6/team-don-t-call-netdev_change_features-under-team-lock.patch
queue-4.6/vxlan-accept-user-specified-mtu-value-when-create-new-vxlan-link.patch
queue-4.6/powerpc-mm-hash-fix-the-reference-bit-update-when-handling-hash-fault.patch
queue-4.6/udp-prevent-skbs-lingering-in-tunnel-socket-queues.patch
queue-4.6/powerpc-pseries-eeh-handle-rtas-delay-requests-in-configure_bridge.patch
queue-4.6/tipc-fix-nametable-publication-field-in-nl-compat.patch
queue-4.6/sfc-on-mc-reset-clear-pio-buffer-linkage-in-txqs.patch
queue-4.6/bpf-use-mount_nodev-not-mount_ns-to-mount-the-bpf-filesystem.patch
queue-4.6/parisc-fix-pagefault-crash-in-unaligned-__get_user-call.patch
queue-4.6/alsa-hda-fix-headset-mic-detection-problem-for-dell-machine.patch
queue-4.6/scsi-add-qemu-cd-rom-to-vpd-inquiry-blacklist.patch
queue-4.6/kvm-irqfd-fix-null-pointer-dereference-in-kvm_irq_map_gsi.patch
queue-4.6/pinctrl-mediatek-fix-dual-edge-code-defect.patch
queue-4.6/netfilter-x_tables-don-t-move-to-non-existent-next-rule.patch
queue-4.6/tcp-record-tlp-and-er-timer-stats-in-v6-stats.patch
queue-4.6/netfilter-x_tables-kill-check_entry-helper.patch
queue-4.6/netfilter-x_tables-check-standard-target-size-too.patch
queue-4.6/netfilter-x_tables-validate-all-offsets-and-sizes-in-a-rule.patch
queue-4.6/gpio-zynq-initialize-clock-even-without-config_pm.patch
queue-4.6/alsa-hda-realtek-add-t560-docking-unit-fixup.patch
queue-4.6/x86-entry-traps-don-t-force-in_interrupt-to-return-true-in-ist-handlers.patch
queue-4.6/memcg-add-rcu-locking-around-css_for_each_descendant_pre-in-memcg_offline_kmem.patch
queue-4.6/alsa-hda-add-pci-id-for-kabylake.patch
queue-4.6/powerpc-pseries-add-power8nvl-support-to-ibm-client-architecture-support-call.patch
queue-4.6/kvm-arm-arm64-vgic-v3-clear-all-dirty-lrs.patch
queue-4.6/fix-d_walk-non-delayed-__d_free-race.patch
queue-4.6/net-alx-use-custom-skb-allocator.patch
queue-4.6/gpio-bail-out-silently-on-null-descriptors.patch
queue-4.6/powerpc-use-privileged-spr-number-for-mmcr2.patch
queue-4.6/bpf-trace-use-read_once-for-retrieving-file-ptr.patch
queue-4.6/net-mvneta-fix-lacking-spinlock-initialization.patch
queue-4.6/s390-bpf-reduce-maximum-program-size-to-64-kb.patch
queue-4.6/netfilter-x_tables-don-t-reject-valid-target-size-on-some-architectures.patch
queue-4.6/kvm-arm-arm64-vgic-v2-clear-all-dirty-lrs.patch
queue-4.6/sparc64-reduce-tlb-flushes-during-hugepte-changes.patch
queue-4.6/switchdev-pass-pointer-to-fib_info-instead-of-copy.patch
queue-4.6/arm64-mm-always-take-dirty-state-from-new-pte-in-ptep_set_access_flags.patch
queue-4.6/alsa-hda-realtek-add-support-for-new-codecs-alc700-alc701-alc703.patch
queue-4.6/revert-drm-i915-exit-cherryview_irq_handler-after-one-pass.patch
queue-4.6/sparc64-fix-return-from-trap-window-fill-crashes.patch
queue-4.6/bridge-don-t-insert-unnecessary-local-fdb-entry-on-changing-mac-address.patch
queue-4.6/net-hwbm-fix-unbalanced-spinlock-in-error-case.patch
queue-4.6/gpio-zynq-fix-the-error-path.patch
queue-4.6/alsa-hda-realtek-alc256-speaker-noise-issue.patch
queue-4.6/uapi-glibc-compat-fix-compilation-when-__use_misc-in-glibc.patch
queue-4.6/s390-bpf-fix-recache-skb-data-hlen-for-skb_vlan_push-pop.patch
reply other threads:[~2016-06-22 22:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=146663435223216@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=jani.nikula@intel.com \
--cc=peter.fruehberger@gmail.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.