Commit 8a25c4be authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/params: switch to device specific parameters 



Start using device specific parameters instead of module parameters for
most things. The module parameters become the immutable initial values
for i915 parameters. The device specific parameters in i915->params
start life as a copy of i915_modparams. Any later changes are only
reflected in the debugfs.

The stragglers are:

* i915.force_probe and i915.modeset. Needed before dev_priv is
  available. This is fine because the parameters are read-only and never
  modified.

* i915.verbose_state_checks. Passing dev_priv to I915_STATE_WARN and
  I915_STATE_WARN_ON would result in massive and ugly churn. This is
  handled by not exposing the parameter via debugfs, and leaving the
  parameter writable in sysfs. This may be fixed up in follow-up work.

* i915.inject_probe_failure. Only makes sense in terms of the module,
  not the device. This is handled by not exposing the parameter via
  debugfs.

v2: Fix uc i915 lookup code (Michał Winiarski)

Cc: Juha-Pekka Heikkilä <juha-pekka.heikkila@intel.com>
Cc: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200618150402.14022-1-jani.nikula@intel.com
parent cf46143f

drivers/gpu/drm/i915/display/intel_bios.c

+3 −3
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv, 
	struct drm_display_mode *panel_fixed_mode;

	int index;



	index = i915_modparams.vbt_sdvo_panel_type;

	index = dev_priv->params.vbt_sdvo_panel_type;

	if (index == -2) {

		drm_dbg_kms(&dev_priv->drm,

			    "Ignore SDVO panel mode from BIOS VBT tables.\n");
@@ -829,9 +829,9 @@ parse_edp(struct drm_i915_private *dev_priv, const struct bdb_header *bdb) 
		u8 vswing;



		/* Don't read from VBT if module parameter has valid value*/

		if (i915_modparams.edp_vswing) {

		if (dev_priv->params.edp_vswing) {

			dev_priv->vbt.edp.low_vswing =

				i915_modparams.edp_vswing == 1;

				dev_priv->params.edp_vswing == 1;

		} else {

			vswing = (edp->edp_vswing_preemph >> (panel_type * 4)) & 0xF;

			dev_priv->vbt.edp.low_vswing = vswing == 0;

drivers/gpu/drm/i915/display/intel_crt.c

+2 −2
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ intel_crt_detect(struct drm_connector *connector, 
		    connector->base.id, connector->name,

		    force);



	if (i915_modparams.load_detect_test) {

	if (dev_priv->params.load_detect_test) {

		wakeref = intel_display_power_get(dev_priv,

						  intel_encoder->power_domain);

		goto load_detect;
@@ -889,7 +889,7 @@ load_detect: 
		else if (INTEL_GEN(dev_priv) < 4)

			status = intel_crt_load_detect(crt,

				to_intel_crtc(connector->state->crtc)->pipe);

		else if (i915_modparams.load_detect_test)

		else if (dev_priv->params.load_detect_test)

			status = connector_status_disconnected;

		else

			status = connector_status_unknown;

drivers/gpu/drm/i915/display/intel_csr.c

+3 −3
Original line number Diff line number Diff line
@@ -723,15 +723,15 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) 
		csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;

	}



	if (i915_modparams.dmc_firmware_path) {

		if (strlen(i915_modparams.dmc_firmware_path) == 0) {

	if (dev_priv->params.dmc_firmware_path) {

		if (strlen(dev_priv->params.dmc_firmware_path) == 0) {

			csr->fw_path = NULL;

			drm_info(&dev_priv->drm,

				 "Disabling CSR firmware and runtime PM\n");

			return;

		}



		csr->fw_path = i915_modparams.dmc_firmware_path;

		csr->fw_path = dev_priv->params.dmc_firmware_path;

		/* Bypass version check for firmware override. */

		csr->required_version = 0;

	}

drivers/gpu/drm/i915/display/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -4886,7 +4886,7 @@ void intel_prepare_reset(struct drm_i915_private *dev_priv) 
	int ret;









	/* reset doesn't touch the display */









	if (!i915_modparams.force_reset_modeset_test &&









	if (!dev_priv->params.force_reset_modeset_test &&









	    !gpu_reset_clobbers_display(dev_priv))









		return;
















@@ -7882,7 +7882,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)







	if (!hsw_crtc_supports_ips(crtc))









		return false;

















	if (!i915_modparams.enable_ips)









	if (!dev_priv->params.enable_ips)









		return false;

















	if (crtc_state->pipe_bpp > 24)








@@ -8153,8 +8153,8 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv)















static bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)









{









	if (i915_modparams.panel_use_ssc >= 0)









		return i915_modparams.panel_use_ssc != 0;









	if (dev_priv->params.panel_use_ssc >= 0)









		return dev_priv->params.panel_use_ssc != 0;









	return dev_priv->vbt.lvds_use_ssc









		&& !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);









}








@@ -13585,8 +13585,8 @@ pipe_config_mismatch(bool fastset, const struct intel_crtc *crtc,















static bool fastboot_enabled(struct drm_i915_private *dev_priv)









{









	if (i915_modparams.fastboot != -1)









		return i915_modparams.fastboot;









	if (dev_priv->params.fastboot != -1)









		return dev_priv->params.fastboot;

















	/* Enable fastboot by default on Skylake and newer */









	if (INTEL_GEN(dev_priv) >= 9)
































drivers/gpu/drm/i915/display/intel_display_debugfs.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -125,7 +125,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)







	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);



















	seq_printf(m, "Enabled by kernel parameter: %s\n",









		   yesno(i915_modparams.enable_ips));









		   yesno(dev_priv->params.enable_ips));



















	if (INTEL_GEN(dev_priv) >= 8) {









		seq_puts(m, "Currently: unknown\n");








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE