Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed35dd7b authored by Michel Thierry's avatar Michel Thierry Committed by Chris Wilson
Browse files

drm/i915: Update i915.reset to handle engine resets 



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: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170615201828.23144-3-michel.thierry@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620095751.13127-4-chris@chris-wilson.co.uk
parent c64992e0

drivers/gpu/drm/i915/i915_params.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_params.h

+1 −1
Original line number Diff line number Diff line
@@ -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); \