diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-02-25 14:46:45 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-02-25 14:46:45 +1100 |
| commit | f246e4b87d4338783e9b6928e27982af64dc270c (patch) | |
| tree | c667286c714dda1fba2c995d10e9371a5d4d5f84 /sys/dev/pci/drm/i915_drv.h | |
| parent | 205ffdc2b015cc4857bb917be5e48bae3eb2854f (diff) | |
sync the chip reset code with linux, we can now reset more than just 965
Diffstat (limited to 'sys/dev/pci/drm/i915_drv.h')
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915_drv.h index 0796edbacad..39bdb573176 100644 --- a/sys/dev/pci/drm/i915_drv.h +++ b/sys/dev/pci/drm/i915_drv.h @@ -618,6 +618,8 @@ struct inteldrm_softc { /* number of ioctls + faults in flight */ int entries; + struct workq_task error_task; + enum intel_pch pch_type; unsigned short pch_id; @@ -769,6 +771,8 @@ struct inteldrm_softc { unsigned int fsb_freq, mem_freq, is_ddr3; + time_t last_gpu_reset; + struct intel_fbdev *fbdev; struct drm_property *broadcast_rgb_property; @@ -1134,7 +1138,8 @@ void inteldrm_wipe_mappings(struct drm_obj *); void inteldrm_set_max_obj_size(struct inteldrm_softc *); void inteldrm_purge_obj(struct drm_obj *); void inteldrm_chipset_flush(struct inteldrm_softc *); -void inteldrm_error(struct inteldrm_softc *); +int intel_gpu_reset(struct drm_device *); +int i915_reset(struct drm_device *); /* i915_gem_evict.c */ int i915_gem_evict_everything(struct inteldrm_softc *); @@ -1181,6 +1186,7 @@ void i915_gem_write_fence(struct drm_device *, int, void i915_gem_reset_fences(struct drm_device *); int i915_gem_object_get_fence(struct drm_i915_gem_object *); int i915_gem_object_put_fence(struct drm_i915_gem_object *); +void i915_gem_reset(struct drm_device *); /* intel_opregion.c */ int intel_opregion_setup(struct drm_device *dev); |