This is a note to let you know that I've just added the patch titled Revert "drm/i915: enable irqs earlier when resuming" to the 3.8-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-enable-irqs-earlier-when-resuming.patch and it can be found in the queue-3.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Mon Mar 18 13:13:39 PDT 2013 Date: Mon, 18 Mar 2013 13:13:39 -0700 To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Subject: Revert "drm/i915: enable irqs earlier when resuming" This reverts commit 31f14f4219d2a74b7a6d86c7798f49141b5eccbe which was commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. It caused problems in the 3.8-stable series, but 3.9-rc is just fine. Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> Cc: Ilya Tumaykin <itumaykin@xxxxxxxxx> Cc: Chris wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> --- drivers/gpu/drm/i915/i915_drv.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -486,7 +486,6 @@ static int i915_drm_freeze(struct drm_de intel_modeset_disable(dev); drm_irq_uninstall(dev); - dev_priv->enable_hotplug_processing = false; } i915_save_state(dev); @@ -563,19 +562,9 @@ static int __i915_drm_thaw(struct drm_de error = i915_gem_init_hw(dev); mutex_unlock(&dev->struct_mutex); - /* We need working interrupts for modeset enabling ... */ - drm_irq_install(dev); - intel_modeset_init_hw(dev); intel_modeset_setup_hw_state(dev, false); - - /* - * ... but also need to make sure that hotplug processing - * doesn't cause havoc. Like in the driver load code we don't - * bother with the tiny race here where we might loose hotplug - * notifications. - * */ - dev_priv->enable_hotplug_processing = true; + drm_irq_install(dev); } intel_opregion_init(dev); Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-3.8/powerpc-fix-stab-initialization.patch queue-3.8/tools-usb-ffs-test-fix-build-failure.patch queue-3.8/net-ipv6-don-t-purge-default-router-if-accept_ra-2.patch queue-3.8/powerpc-fix-cputable-entry-for-970mp-rev-1.0.patch queue-3.8/tty-serial-fix-typo-arch_s5p6450.patch queue-3.8/atl1c-restore-buffer-state.patch queue-3.8/fix-4-port-and-add-support-for-8-port-unknown-pci-serial-port-cards.patch queue-3.8/powerpc-rename-user_esid_bits-to-esid_bits.patch queue-3.8/rds-limit-the-size-allocated-by-rds_message_alloc.patch queue-3.8/revert-drm-i915-enable-irqs-earlier-when-resuming.patch queue-3.8/serial-8250-keep-8250.-xxxx-module-options-functional-after-driver-rename.patch queue-3.8/l2tp-restore-socket-refcount-when-sendmsg-succeeds.patch queue-3.8/xen-pciback-don-t-disable-a-pci-device-that-is-already-disabled.patch queue-3.8/qcserial-bind-to-dm-diag-port-on-gobi-1k-devices.patch queue-3.8/powerpc-make-vsid_bits-dependency-explicit.patch queue-3.8/revert-drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch queue-3.8/vxlan-fix-oops-when-delete-netns-containing-vxlan.patch queue-3.8/tty-serial-fix-typo-serial_s3c2412.patch queue-3.8/net-sctp-validate-parameter-size-for-sctp_get_assoc_stats.patch queue-3.8/usb-cp210x-new-vendor-device-ids.patch queue-3.8/mtd-nand-reintroduce-nand_no_readrdy-as-nand_need_readrdy.patch queue-3.8/powerpc-update-kernel-vsid-range.patch queue-3.8/ipv6-stop-multicast-forwarding-to-process-interface-scoped-addresses.patch queue-3.8/perf-x86-fix-link-failure-for-non-intel-configs.patch queue-3.8/staging-comedi-dt9812-use-cr_chan-for-channel-number.patch queue-3.8/serial-8250_pci-add-support-for-another-kind-of-netmos-technology-pci-9835-multi-i-o-controller.patch queue-3.8/usb-option-add-huawei-e5331.patch queue-3.8/arm-kirkwood-fix-to-retain-gbe-mac-addresses-for-dt-kernels.patch queue-3.8/tty-do-not-reset-master-s-packet-mode.patch queue-3.8/macvlan-set-iff_unicast_flt-flag-to-prevent-unnecessary-promisc-mode.patch queue-3.8/tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch queue-3.8/signal-always-clear-sa_restorer-on-execve.patch queue-3.8/hwmon-pmbus-ltc2978-fix-temperature-reporting.patch queue-3.8/staging-vt6656-fix-oops-on-resume-from-suspend.patch queue-3.8/btrfs-use-rcu_barrier-to-wait-for-bdev-puts-at-unmount.patch queue-3.8/arm-davinci-edma-fix-dmaengine-induced-null-pointer-dereference-on-da830.patch queue-3.8/usb-added-support-for-cinterion-s-products-ah6-and-pls8.patch queue-3.8/qcaux-add-franklin-u600.patch queue-3.8/ext3-fix-format-string-issues.patch queue-3.8/usb-ehci-work-around-silicon-bug-in-intel-s-ehci-controllers.patch queue-3.8/arm-w1-gpio-fix-erroneous-gpio-requests.patch queue-3.8/bonding-fire-netdev_release-event-only-on-0-slaves.patch queue-3.8/team-unsyc-the-devices-addresses-when-port-is-removed.patch queue-3.8/6lowpan-fix-endianness-issue-in-is_addr_link_local.patch queue-3.8/netlabel-correctly-list-all-the-static-label-mappings.patch queue-3.8/perf-x86-fix-wrmsr_on_cpu-warning-on-suspend-resume.patch queue-3.8/bridging-fix-rx_handlers-return-code.patch queue-3.8/kbuild-fix-make-headers_check-with-make-3.80.patch queue-3.8/bridge-fix-mdb-info-leaks.patch queue-3.8/s390-mm-fix-flush_tlb_kernel_range.patch queue-3.8/net-mlx4_en-disable-rfs-when-running-in-sriov-mode.patch queue-3.8/tcp-fix-double-counted-receiver-rtt-when-leaving-receiver-fast-path.patch queue-3.8/usb-serial-add-rigblaster-advantage-to-device-table.patch queue-3.8/virtio-rng-disallow-multiple-device-registrations-fixes-crashes.patch queue-3.8/hwmon-lineage-pem-add-missing-terminating-entry-for-pem__attributes.patch queue-3.8/perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch queue-3.8/w1-gpio-remove-erroneous-__exit-and-__exit_p.patch queue-3.8/dcbnl-fix-various-netlink-info-leaks.patch queue-3.8/loopdev-fix-a-deadlock.patch queue-3.8/w1-fix-oops-when-w1_search-is-called-from-netlink-connector.patch queue-3.8/net-mlx4_en-initialize-rfs-filters-lock-and-list-in-init_netdev.patch queue-3.8/rtnl-fix-info-leak-on-rtm_getlink-request-for-vf-devices.patch queue-3.8/usb-cdc-wdm-fix-buffer-overflow.patch queue-3.8/selinux-use-gfp_atomic-under-spin_lock.patch queue-3.8/usb-ehci-don-t-check-dma-values-in-qh-overlays.patch queue-3.8/block-use-i_size_write-in-bd_set_size.patch queue-3.8/usb-dwc3-core-don-t-forget-to-free-coherent-memory.patch queue-3.8/loopdev-remove-an-user-triggerable-oops.patch queue-3.8/atmel_lcdfb-fix-16-bpp-modes-on-older-socs.patch queue-3.8/usb-storage-fix-huawei-mode-switching-regression.patch queue-3.8/tun-add-a-missing-nf_reset-in-tun_net_xmit.patch queue-3.8/s390-critical-section-cleanup-vs.-machine-checks.patch queue-3.8/alsa-seq-fix-missing-error-handling-in-snd_seq_timer_open.patch queue-3.8/tty-disable-debugging-warning.patch queue-3.8/tty-serial-add-support-for-altera-serial-port.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html