diff options
| author | Jani Nikula | 2018-09-26 15:34:14 +0200 |
|---|---|---|
| committer | Jani Nikula | 2018-09-27 08:25:19 +0200 |
| commit | e7351a8474d2df929751ef1397ac7f9c6d3c4e22 (patch) | |
| tree | e29b40f72716760374de6bd9a139ad6925802637 /drivers/gpu/drm/i915/intel_csr.c | |
| parent | drm/i915/csr: keep max firmware size together with firmare name and version (diff) | |
| download | kernel-qcow2-linux-e7351a8474d2df929751ef1397ac7f9c6d3c4e22.tar.gz kernel-qcow2-linux-e7351a8474d2df929751ef1397ac7f9c6d3c4e22.tar.xz kernel-qcow2-linux-e7351a8474d2df929751ef1397ac7f9c6d3c4e22.zip | |
drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""
With i915.dmc_firmware_path="" it's obvious the intention is to disable
CSR firmware loading. Bypass the firmware request altogether in this
case, with more obvious debug logging.
v2: Use DRM_INFO for logging (Chris)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180926133414.22073-3-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_csr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index b3a084c48a94..81935da9cd6b 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -485,6 +485,12 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) } if (i915_modparams.dmc_firmware_path) { + if (strlen(i915_modparams.dmc_firmware_path) == 0) { + csr->fw_path = NULL; + DRM_INFO("Disabling CSR firmare and runtime PM\n"); + return; + } + csr->fw_path = i915_modparams.dmc_firmware_path; /* Bypass version check for firmware override. */ csr->required_version = 0; |