redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915: Report to userspace if we have a (presumed) working GPU reset

Browse source 
In igt, we want to test handling of GPU hangs, both for recovery
purposes and for reporting. However, we don't want to inject a genuine
GPU hang onto a machine that cannot recover and so be permenantly
wedged. Rather than embed heuristics into igt, have the kernel report
exactly when it expects the GPU reset to work.

This can also be usefully extended in future to indicate different
levels of fine-grained resets.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Tim Gore <tim.gore@intel.com>
Cc: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2015-06-15 12:23:48 +01:00 committed by Daniel Vetter
parent 0d80418426
commit 49e4d842f0
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_dma.c
View file

@ -163,6 +163,11 @@ static int i915_getparam(struct drm_device *dev, void *data,
if (!value)
return -ENODEV;
break;
case I915_PARAM_HAS_GPU_RESET:
value = i915.enable_hangcheck &&
i915.reset &&
intel_has_gpu_reset(dev);
break;
default:
DRM_DEBUG("Unknown parameter %d\n", param->param);
return -EINVAL;

1
drivers/gpu/drm/i915/i915_drv.h
View file

@ -2594,6 +2594,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
unsigned long arg);
#endif
extern int intel_gpu_reset(struct drm_device *dev);
extern bool intel_has_gpu_reset(struct drm_device *dev);
extern int i915_reset(struct drm_device *dev);
extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv);
extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);

28
drivers/gpu/drm/i915/intel_uncore.c
View file

@ -1455,20 +1455,36 @@ static int gen6_do_reset(struct drm_device *dev)
return ret;
}
int intel_gpu_reset(struct drm_device *dev)
static int (*intel_get_gpu_reset(struct drm_device *dev))(struct drm_device *)
{
if (INTEL_INFO(dev)->gen >= 6)
return gen6_do_reset(dev);
return gen6_do_reset;
else if (IS_GEN5(dev))
return ironlake_do_reset(dev);
return ironlake_do_reset;
else if (IS_G4X(dev))
return g4x_do_reset(dev);
return g4x_do_reset;
else if (IS_G33(dev))
return g33_do_reset(dev);
return g33_do_reset;
else if (INTEL_INFO(dev)->gen >= 3)
return i915_do_reset(dev);
return i915_do_reset;
else
return NULL;
}
int intel_gpu_reset(struct drm_device *dev)
{
int (*reset)(struct drm_device *);
reset = intel_get_gpu_reset(dev);
if (reset == NULL)
return -ENODEV;
return reset(dev);
}
bool intel_has_gpu_reset(struct drm_device *dev)
{
return intel_get_gpu_reset(dev) != NULL;
}
void intel_uncore_check_errors(struct drm_device *dev)

1
include/uapi/drm/i915_drm.h
View file

@ -354,6 +354,7 @@ typedef struct drm_i915_irq_wait {
#define I915_PARAM_REVISION 32
#define I915_PARAM_SUBSLICE_TOTAL 33
#define I915_PARAM_EU_TOTAL 34
#define I915_PARAM_HAS_GPU_RESET 35
typedef struct drm_i915_getparam {
int param;