Marek Olšák
ec00efb72f
drm/radeon/kms: increase lockup detection interval to 10 sec for r100-r500 ...
One subtest of mesa/demos/gltestperf takes 9 seconds to complete,
so to prevent an unnecessary gpu reset followed by a hardlock, I am
increasing the interval to 10 seconds after which a GPU is considered
in a locked-up state. This is on RV530. However, with a little slower GPU,
we would surpass the interval easily, so this is not a good fix
for gltestperf.
Nevertheless, this commit also fixes hardlocks in the applications which
render at speed of less than 1 frame per second, where the whole frame
consists of only one command stream. The game Tiny & Big is an example.
This bar is now lowered to 0.1 fps.
Now the question comes down to whether we should (often unsuccessfully)
reset the GPU at all? Once we have stable enough drivers, we won't have to.
Has the time come already?
If possible, this commit should go to stable as well.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-09-13 20:30:02 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2010-09-07 16:00:17 -07:00
libata-sff: Reenable Port Multiplier after libata-sff remodeling.
2010-09-09 22:31:55 -04:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
PM: Prevent waiting forever on asynchronous resume after failing suspend
2010-09-09 00:49:43 +02:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2010-09-10 07:26:27 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-09-08 11:19:18 -07: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
gpio: sx150x: correct and refine reset-on-probe behavior
2010-09-09 18:57:24 -07:00
drm/radeon/kms: increase lockup detection interval to 10 sec for r100-r500
2010-09-13 20:30:02 +10: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
hp_accel: add quirks for HP ProBook 532x and HP Mini 5102
2010-09-09 18:57:22 -07:00
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
2010-08-14 11:57:54 -07:00
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 branches 'cxgb3' and 'nes' into for-linus
2010-09-08 14:43:28 -07:00
Input: i8042 - fix device removal on unload
2010-08-31 18:28:15 -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: resolve confusion of MD_CHANGE_CLEAN
2010-08-30 18:06:21 +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/imxmmc.c: adjust confusing if indentation
2010-09-09 18:57:23 -07:00
UBI: do not oops when erroneous PEB is scheduled for scrubbing
2010-08-30 13:32:31 +03:00
ipheth: remove incorrect devtype to WWAN
2010-09-09 21:41:59 -07:00
oprofile: fix crash when accessing freed task structs
2010-08-25 09:09:09 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2010-09-07 16:00:17 -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
drivers/rtc/rtc-pl031.c: do not mark PL031 IRQ as shared
2010-09-09 18:57:24 -07:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2010-09-10 07:26:27 -07:00
[SCSI] fix use-after-free in scsi_init_io()
2010-09-09 09:58:18 -05:00
serial: bfin_sport_uart: restore transmit frame sync fix
2010-09-03 17:29:04 -07:00
m68knommu: include sched.h in ColdFire/SPI driver
2010-08-18 12:44:31 +10:00
Staging: wlan-ng: Explicitly set some fields in cfg80211 interface
2010-09-03 17:37:16 -07:00
USB: ftdi_sio: Added custom PIDs for ChamSys products
2010-09-03 17:33:41 -07:00
vhost: error handling fix
2010-09-06 09:49:39 +03:00
ARM: pxa168fb: fix section mismatch
2010-08-30 09:59:44 +08: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
ec00efb72f