From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 3/3] drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""
Date: Thu, 6 Sep 2018 11:21:26 +0300 [thread overview]
Message-ID: <20180906082126.15539-3-jani.nikula@intel.com> (raw)
In-Reply-To: <20180906082126.15539-1-jani.nikula@intel.com>
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.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_csr.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 956ac8bbf5e4..dbaeffddb5e7 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -476,6 +476,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_DEBUG_KMS("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;
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-09-06 8:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 8:21 [PATCH 1/3] drm/i915/csr: keep firmware name and required version together Jani Nikula
2018-09-06 8:21 ` [PATCH 2/3] drm/i915/csr: keep max firmware size together with firmare name and version Jani Nikula
2018-09-06 9:39 ` Chris Wilson
2018-09-06 10:30 ` Jani Nikula
2018-09-06 8:21 ` Jani Nikula [this message]
2018-09-06 9:08 ` [PATCH 3/3] drm/i915/csr: bypass firmware request on i915.dmc_firmware_path="" Chris Wilson
2018-09-06 9:40 ` Chris Wilson
2018-09-06 8:55 ` ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915/csr: keep firmware name and required version together Patchwork
2018-09-06 9:07 ` [PATCH 1/3] " Chris Wilson
2018-09-06 9:20 ` Jani Nikula
2018-09-06 9:11 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] " Patchwork
2018-09-06 9:33 ` [PATCH 1/3] " Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180906082126.15539-3-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox