This is a note to let you know that I've just added the patch titled
Revert "drm/i915: correctly order the ring init sequence"
to the 3.5-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-correctly-order-the-ring-init-sequence.patch
and it can be found in the queue-3.5 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 622ecb9ace2ec006b58f6779732961945ea303ca Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Date: Tue, 7 Aug 2012 09:54:14 +0200
Subject: Revert "drm/i915: correctly order the ring init sequence"
From: Greg Kroah-Hartman <gre...@linuxfoundation.org>
This reverts 622ecb9ace2ec006b58f6779732961945ea303ca which is
commit 0d8957c8a90bbb5d34fab9a304459448a5131e06 upstream.
We may only start to set up the new register values after having
confirmed that the ring is truely off. Otherwise the hw might lose the
newly written register values. This is caught later on in the init
sequence, when we check whether the register writes have stuck.
Reported-by: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
Cc: Jani Nikula <jani.nik...@intel.com>
Cc: Yang Guang <guang.a.y...@intel.com>
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -280,6 +280,8 @@ static int init_ring_common(struct intel
I915_WRITE_HEAD(ring, 0);
ring->write_tail(ring, 0);
+ /* Initialize the ring. */
+ I915_WRITE_START(ring, obj->gtt_offset);
head = I915_READ_HEAD(ring) & HEAD_ADDR;
/* G45 ring initialization fails to reset head to zero */
@@ -305,11 +307,6 @@ static int init_ring_common(struct intel
}
}
- /* Initialize the ring. This must happen _after_ we've cleared the ring
- * registers with the above sequence (the readback of the HEAD registers
- * also enforces ordering), otherwise the hw might lose the new ring
- * register values. */
- I915_WRITE_START(ring, obj->gtt_offset);
I915_WRITE_CTL(ring,
((ring->size - PAGE_SIZE) & RING_NR_PAGES)
| RING_VALID);
Patches currently in stable-queue which might be from
gre...@linuxfoundation.org are
queue-3.5/8021q-fix-mac_len-recomputation-in-vlan_untag.patch
queue-3.5/drm-destroy-the-planes-prior-to-destroying-the-associated-crtc.patch
queue-3.5/pm-sleep-use-resume-event-when-call-dpm_resume_early.patch
queue-3.5/ext4-online-defrag-is-not-supported-for-journaled-files.patch
queue-3.5/kbuild-fix-gcc-x-syntax.patch
queue-3.5/ext4-fix-potential-deadlock-in-ext4_nonda_switch.patch
queue-3.5/mm-fix-invalidate_complete_page2-lock-ordering.patch
queue-3.5/xfrm_user-return-error-pointer-instead-of-null-2.patch
queue-3.5/bnx2x-fix-rx-checksum-validation-for-ipv6.patch
queue-3.5/sierra_net-endianess-bug-fix.patch
queue-3.5/tcp-flush-dma-queue-before-sk_wait_data-if-rcv_wnd-is-zero.patch
queue-3.5/ipv6-fix-return-value-check-in-fib6_add.patch
queue-3.5/mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma.patch
queue-3.5/localmodconfig-fix-localyesconfig-to-set-to-y-not-m.patch
queue-3.5/drm-radeon-force-msis-on-rs690-asics.patch
queue-3.5/powerpc-eeh-fix-crash-on-converting-of-node-to-edev.patch
queue-3.5/ext4-fix-crash-when-accessing-proc-mounts-concurrently.patch
queue-3.5/arm-7548-1-include-linux-sched.h-in-syscall.h.patch
queue-3.5/ipv6-mip6-fix-mip6_mh_filter.patch
queue-3.5/slab-fix-the-deadlock-issue-on-l3-alien-lock.patch
queue-3.5/mfd-max8925-move-_io-resources-out-of-ioport_ioresource.patch
queue-3.5/drm-i915-prevent-possible-pin-leak-on-error-path.patch
queue-3.5/revert-kvm-vmx-fix-kvm_set_sregs-with-big-real-mode-segments.patch
queue-3.5/drm-radeon-add-msi-quirk-for-gateway-rs690.patch
queue-3.5/drivers-scsi-atp870u.c-fix-bad-use-of-udelay.patch
queue-3.5/pci-acpiphp-check-whether-_adr-evaluation-succeeded.patch
queue-3.5/scsi-zfcp-do-not-wakeup-while-suspended.patch
queue-3.5/mn10300-only-add-mmem-funcs-to-kbuild_cflags-if-gcc-supports-it.patch
queue-3.5/frv-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/ipv6-release-reference-of-ip6_null_entry-s-dst-entry-in-__ip6_del_rt.patch
queue-3.5/scsi-zfcp-adapt-to-new-fc_portspeed-semantics.patch
queue-3.5/xfrm_user-ensure-user-supplied-esn-replay-window-is-valid.patch
queue-3.5/scsi-zfcp-only-access-zfcp_scsi_dev-for-valid-scsi_device.patch
queue-3.5/drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch
queue-3.5/media-gspca_pac7302-add-support-for-device-1ae7-2001-speedlink-snappy-microphone-sl-6825-sbk.patch
queue-3.5/l2tp-fix-a-typo-in-l2tp_eth_dev_recv.patch
queue-3.5/revert-drm-i915-correctly-order-the-ring-init-sequence.patch
queue-3.5/netxen-check-for-root-bus-in-netxen_mask_aer_correctable.patch
queue-3.5/net-guard-tcp_set_keepalive-to-tcp-sockets.patch
queue-3.5/drm-i915-flush-the-pending-flips-on-the-crtc-before-modification.patch
queue-3.5/lguest-fix-occasional-crash-in-example-launcher.patch
queue-3.5/ext4-fix-fdatasync-for-files-with-only-i_size-changes.patch
queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch
queue-3.5/net-sched-sch_cbq-avoid-infinite-loop.patch
queue-3.5/cris-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/mempolicy-fix-a-race-in-shared_policy_replace.patch
queue-3.5/net-small-bug-on-rxhash-calculation.patch
queue-3.5/ext4-don-t-copy-non-existent-gdt-blocks-when-resizing.patch
queue-3.5/ipv6-del-unreachable-route-when-an-addr-is-deleted-on-lo.patch
queue-3.5/xfrm_user-don-t-copy-esn-replay-window-twice-for-new-states.patch
queue-3.5/ipv6-raw-fix-icmpv6_filter.patch
queue-3.5/acpi-run-_osc-after-acpi_full_initialization.patch
queue-3.5/workqueue-add-missing-smp_wmb-in-process_one_work.patch
queue-3.5/net-do-not-disable-sg-for-packets-requiring-no-checksum.patch
queue-3.5/ext4-move_extent-code-cleanup.patch
queue-3.5/m68k-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/ipv4-raw-fix-icmp_filter.patch
queue-3.5/scsi-zfcp-restore-refcount-check-on-port_remove.patch
queue-3.5/net-ethernet-davinci_cpdma-decrease-the-desc-count-when-cleaning-up-the-remaining-packets.patch
queue-3.5/netrom-copy_datagram_iovec-can-fail.patch
queue-3.5/alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch
queue-3.5/pkt_sched-fix-virtual-start-time-update-in-qfq.patch
queue-3.5/alsa-usb-support-for-original-xbox-communicator.patch
queue-3.5/kernel-sys.c-call-disable_nonboot_cpus-in-kernel_restart.patch
queue-3.5/xfrm_user-fix-info-leak-in-copy_to_user_tmpl.patch
queue-3.5/alpha-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/xfrm_user-fix-info-leak-in-copy_to_user_auth.patch
queue-3.5/alsa-hda-add-inverted-internal-mic-quirk-for-lenovo-ideapad-u310.patch
queue-3.5/alsa-usb-disable-broken-hw-volume-for-tenx-tp6911.patch
queue-3.5/xfrm_user-return-error-pointer-instead-of-null.patch
queue-3.5/h8300-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/alsa-hda-realtek-fix-detection-of-alc271x-codec.patch
queue-3.5/drm-savage-re-add-busmaster-enable-regression-fix.patch
queue-3.5/intel-iommu-default-to-non-coherent-for-domains-unattached-to-iommus.patch
queue-3.5/rcu-fix-day-one-dyntick-idle-stall-warning-bug.patch
queue-3.5/cpu-hotplug-cpusets-suspend-don-t-modify-cpusets-during-suspend-resume.patch
queue-3.5/xfrm_user-fix-info-leak-in-copy_to_user_policy.patch
queue-3.5/ext4-always-set-i_op-in-ext4_mknod.patch
queue-3.5/ext4-ignore-last-group-w-o-enough-space-when-resizing-instead-of-bug-ing.patch
queue-3.5/mempolicy-remove-mempolicy-sharing.patch
queue-3.5/drm-i915-fix-gt_mode-default-value.patch
queue-3.5/kpageflags-fix-wrong-kpf_thp-on-non-huge-compound-pages.patch
queue-3.5/revert-mm-mempolicy-let-vma_merge-and-vma_split-handle-vma-vm_policy-linkages.patch
queue-3.5/jbd2-don-t-write-superblock-when-if-its-empty.patch
queue-3.5/mm-thp-fix-pmd_present-for-split_huge_page-and-prot_none-with-thp.patch
queue-3.5/hugetlb-do-not-use-vma_hugecache_offset-for-vma_prio_tree_foreach.patch
queue-3.5/xfrm-fix-a-read-lock-imbalance-in-make_blackhole.patch
queue-3.5/scsi-zfcp-remove-invalid-reference-to-list-iterator-variable.patch
queue-3.5/em28xx-make-all-em28xx-extensions-to-be-initialized-asynchronously.patch
queue-3.5/xfrm-workaround-incompatibility-of-esn-and-async-crypto.patch
queue-3.5/asoc-wm_hubs-ensure-volume-updates-are-handled-during-class-w-startup.patch
queue-3.5/pppoe-drop-pppox_zombies-in-pppoe_release.patch
queue-3.5/mips-ath79-use-correct-fractional-dividers-for-cpu-ddr-_pll-on-ar934x.patch
queue-3.5/kbuild-make-fix-if_changed-when-command-contains-backslashes.patch
queue-3.5/scsi-zfcp-bounds-checking-for-deferred-error-trace.patch
queue-3.5/ext4-avoid-duplicate-writes-of-the-backup-bg-descriptor-blocks.patch
queue-3.5/mempolicy-fix-refcount-leak-in-mpol_set_shared_policy.patch
queue-3.5/rapidio-rionet-fix-multicast-packet-transmit-logic.patch
queue-3.5/ixgbe-fix-ptp-ethtool-timestamping-function.patch
queue-3.5/scsi-zfcp-make-trace-record-tags-unique.patch
queue-3.5/drm-nvc0-fence-restore-pre-suspend-fence-buffer-context-on-resume.patch
queue-3.5/parisc-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/ia64-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/m32r-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/alsa-aloop-add-locking-to-timer-access.patch
queue-3.5/score-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/efi-build-efi-stub-with-efi-appropriate-options.patch
queue-3.5/xfrm_user-fix-info-leak-in-copy_to_user_state.patch
queue-3.5/efi-initialize-efi.runtime_version-to-make-query_variable_info-update_capsule-workable.patch
queue-3.5/batman-adv-make-batadv_test_bit-return-0-or-1-only.patch
queue-3.5/mn10300-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/media-rc-ite-cir-initialise-ite_dev-rdev-earlier.patch
queue-3.5/xtensa-add-missing-rcu-idle-apis-on-idle-loop.patch
queue-3.5/asoc-wm9712-fix-name-of-capture-switch.patch
queue-3.5/aoe-assert-aoe-packets-marked-as-requiring-no-checksum.patch
queue-3.5/tcp-fix-regression-in-urgent-data-handling.patch
queue-3.5/ixp4xx_hss-fix-build-failure-due-to-missing-linux-module.h-inclusion.patch
queue-3.5/drm-i915-call-drm_handle_vblank-before-finish_page_flip.patch
queue-3.5/lib-gcd.c-prevent-possible-div-by-0.patch
queue-3.5/sctp-don-t-charge-for-data-in-sndbuf-again-when-transmitting-packet.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
