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

Commit 6764e9f8 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: skip modeset if compatible for everyone. 



This is done as a separate commit, to make it easier to revert
when things break.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bfd16b2a

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -2644,7 +2644,6 @@ struct i915_params { 
	int enable_cmd_parser;

	/* leave bools at the end to not create holes */

	bool enable_hangcheck;

	bool fastboot;

	bool prefault_disable;

	bool load_detect_test;

	bool reset;

drivers/gpu/drm/i915/i915_params.c

+0 −5
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct i915_params i915 __read_mostly = { 
	.preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT),

	.disable_power_well = 1,

	.enable_ips = 1,

	.fastboot = 0,

	.prefault_disable = 0,

	.load_detect_test = 0,

	.reset = true,
@@ -133,10 +132,6 @@ MODULE_PARM_DESC(disable_power_well, 
module_param_named(enable_ips, i915.enable_ips, int, 0600);

MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)");



module_param_named(fastboot, i915.fastboot, bool, 0600);

MODULE_PARM_DESC(fastboot,

	"Try to skip unnecessary mode sets at boot time (default: false)");



module_param_named_unsafe(prefault_disable, i915.prefault_disable, bool, 0600);

MODULE_PARM_DESC(prefault_disable,

	"Disable page prefaulting for pread/pwrite/reloc (default:false). "

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Diff line number Diff line
@@ -13005,8 +13005,7 @@ static int intel_atomic_check(struct drm_device *dev, 
		if (ret)

			return ret;



		if (i915.fastboot &&

		    intel_pipe_config_compare(state->dev,

		if (intel_pipe_config_compare(state->dev,

					to_intel_crtc_state(crtc->state),

					pipe_config, true)) {

			crtc_state->mode_changed = false;