Simon Farnsworth
4e5359cd05
drm/i915: Avoid pageflipping freeze when we miss the flip prepare interrupt ...
When we miss the flip prepare interrupt, we never get into the
software state needed to restart userspace, resulting in a freeze of a
full-screen OpenGL application (such as a compositor).
Work around this by checking DSPxSURF/DSPxBASE to see if the page flip
has actually happened. If it has, do the work we would have done when
the flip prepare interrupt comes in.
Also, add debugfs information to tell us what's going on (based on the
patch from Chris Wilson attached to bugs.fdo bug #29798 ).
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2010-09-07 11:16:35 +01:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-08-15 17:37:07 -07:00
libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
2010-08-25 19:24:16 -04:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
firmware_class: fix typo in error path
2010-08-23 18:12:46 -07:00
Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6
2010-08-23 18:29:18 -07:00
agp/intel: Promote warning about failure to setup flush to error.
2010-09-06 23:09:53 +01:00
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
amd64_edac: Do not report error overflow as a separate error
2010-08-26 12:46:03 +02:00
firewire: ohci: work around VIA and NEC PHY packet reception bug
2010-08-29 09:17:31 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
gpiolib: Implement set_debounce for WM831x GPIOs
2010-08-12 11:27:57 +02:00
drm/i915: Avoid pageflipping freeze when we miss the flip prepare interrupt
2010-09-07 11:16:35 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2010-08-18 15:29:38 -07:00
hwmon: (k8temp) Differentiate between AM2 and ASB1
2010-08-25 15:42:12 +02:00
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
2010-08-14 11:57:54 -07:00
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-08-15 11:17:52 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
2010-08-25 07:51:40 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-23 18:30:30 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
via-pmu: Add compat_pmu_ioctl
2010-08-24 15:28:28 +10:00
md raid-1/10 Fix bio_rw bit manipulations again
2010-08-18 16:16:05 +10:00
V4L/DVB: mantis: Fix IR_CORE dependency
2010-08-24 10:42:08 -07:00
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
fusion: add function parameter names to kernel-doc
2010-08-14 16:21:00 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2010-08-12 10:01:30 -07:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function
2010-08-20 09:34:55 -07:00
Merge git://git.infradead.org/mtd-2.6
2010-08-21 12:47:05 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-28 15:42:44 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge git://git.infradead.org/iommu-2.6
2010-08-15 17:34:20 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
intel_scu_ipc: fix IPC i2c write bug
2010-08-24 10:42:09 -07:00
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
regulator: Remove default DEBUG define from TPS6586x
2010-08-11 11:38:03 +01:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: sysrq - drop tty argument form handle_sysrq()
2010-08-21 00:34:45 -07:00
drivers/scsi/qla4xxx: fix build
2010-08-20 09:34:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-28 13:55:31 -07:00
m68knommu: include sched.h in ColdFire/SPI driver
2010-08-18 12:44:31 +10:00
Staging: sep: remove driver
2010-08-23 18:15:38 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-28 13:55:31 -07:00
matroxfb: fix incorrect use of memcpy_toio()
2010-08-20 09:34:54 -07:00
watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
2010-08-13 20:54:53 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-28 13:55:31 -07:00
4e5359cd05