diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-03-28 19:36:15 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-03-28 19:36:15 +0000 |
| commit | 9e93fe1ffefc384b79a3db87fe579667e962071d (patch) | |
| tree | 4b77e97e7998cb0ff1c4e25238a04a121ac039fd | |
| parent | 82f720b15edc1778e5b22500c9c6c34da2b5138f (diff) | |
Add i915_enable_hangcheck parameter.
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 885bb0b066f..2b84941a775 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.10 2013/03/28 11:51:05 jsg Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.11 2013/03/28 19:36:14 kettenis Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -110,6 +110,13 @@ int i915_panel_use_ssc = -1; */ int i915_vbt_sdvo_panel_type = -1; +/* + * Periodically check GPU activity for detecting hangs. + * WARNING: Disabling this can cause system wide hangs. + * (default: true) + */ +bool i915_enable_hangcheck = true; + const struct intel_device_info * i915_get_device_id(int); int inteldrm_probe(struct device *, void *, void *); diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index 3fca3a28d80..79af66850e4 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.8 2013/03/28 11:51:05 jsg Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.9 2013/03/28 19:36:14 kettenis Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -1542,6 +1542,7 @@ extern int i915_semaphores; extern int i915_vbt_sdvo_panel_type; extern int i915_enable_rc6; extern int i915_enable_fbc; +extern bool i915_enable_hangcheck; /* Inlines */ |