drm/i915: Update i915.reset to handle engine resets
authorMichel Thierry <michel.thierry@intel.com>
Tue, 20 Jun 2017 09:57:45 +0000 (10:57 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 20 Jun 2017 20:00:07 +0000 (21:00 +0100)
In preparation for engine reset work update this parameter to handle more
than one type of reset. Default at the moment is still full gpu reset.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170615201828.23144-3-michel.thierry@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620095751.13127-4-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_params.c
drivers/gpu/drm/i915/i915_params.h

index b6a7e363d07699e79a6b3d957c1444299a3f8fe6..045cadb772851fc3587fb90b147986870b2747b6 100644 (file)
@@ -46,7 +46,7 @@ struct i915_params i915 __read_mostly = {
        .prefault_disable = 0,
        .load_detect_test = 0,
        .force_reset_modeset_test = 0,
-       .reset = true,
+       .reset = 1,
        .error_capture = true,
        .invert_brightness = 0,
        .disable_display = 0,
@@ -115,8 +115,8 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,
        "Override/Ignore selection of SDVO panel mode in the VBT "
        "(-2=ignore, -1=auto [default], index in VBT BIOS table)");
 
-module_param_named_unsafe(reset, i915.reset, bool, 0600);
-MODULE_PARM_DESC(reset, "Attempt GPU resets (default: true)");
+module_param_named_unsafe(reset, i915.reset, int, 0600);
+MODULE_PARM_DESC(reset, "Attempt GPU resets (0=disabled, 1=full gpu reset [default], 2=engine reset)");
 
 #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
 module_param_named(error_capture, i915.error_capture, bool, 0600);
index 34148cc8637c1ac721bb6f481a9a2f7b1d671d66..febbfdbd30bdb179ec310af6e5c7c1a54944d4db 100644 (file)
@@ -51,6 +51,7 @@
        func(int, use_mmio_flip); \
        func(int, mmio_debug); \
        func(int, edp_vswing); \
+       func(int, reset); \
        func(unsigned int, inject_load_failure); \
        /* leave bools at the end to not create holes */ \
        func(bool, alpha_support); \
@@ -60,7 +61,6 @@
        func(bool, prefault_disable); \
        func(bool, load_detect_test); \
        func(bool, force_reset_modeset_test); \
-       func(bool, reset); \
        func(bool, error_capture); \
        func(bool, disable_display); \
        func(bool, verbose_state_checks); \