All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915: allow to load DMC firmware on next gen
@ 2018-11-17  0:42 Lucas De Marchi
  2018-11-17  0:42 ` [PATCH 2/2] drm/i915: Downgrade unknown CSR firmware warnings Lucas De Marchi
                   ` (6 more replies)
  0 siblings, 7 replies; 14+ messages in thread
From: Lucas De Marchi @ 2018-11-17  0:42 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi

Before commit d8a5b7d79fb7 ("drm/i915/csr: keep max firmware size together
with firmare name and version") it was possible to load the firmware for
testing purposes via parameter. Let's use the size of the last known
platform to recover that behavior.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index c1ca6596ff5c..b4476d891fa3 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,8 @@
  * low-power state and comes back to normal.
  */
 
+#define GEN12_CSR_MAX_FW_SIZE		ICL_CSR_MAX_FW_SIZE
+
 #define ICL_CSR_PATH			"i915/icl_dmc_ver1_07.bin"
 #define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
 #define ICL_CSR_MAX_FW_SIZE		0x6000
@@ -467,7 +469,10 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	 */
 	intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
 
-	if (IS_ICELAKE(dev_priv)) {
+	if (INTEL_GEN(dev_priv) >= 12) {
+		/* Allow to load fw via parameter using the last known size */
+		csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE;
+	} else if (IS_ICELAKE(dev_priv)) {
 		csr->fw_path = ICL_CSR_PATH;
 		csr->required_version = ICL_CSR_VERSION_REQUIRED;
 		csr->max_fw_size = ICL_CSR_MAX_FW_SIZE;
-- 
2.19.1.1.g56c4683e68

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2018-11-22  0:14 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-17  0:42 [PATCH 1/2] drm/i915: allow to load DMC firmware on next gen Lucas De Marchi
2018-11-17  0:42 ` [PATCH 2/2] drm/i915: Downgrade unknown CSR firmware warnings Lucas De Marchi
2018-11-18 22:01   ` Chris Wilson
2018-11-19 10:43     ` Joonas Lahtinen
2018-11-19 17:52       ` Rodrigo Vivi
2018-11-21  9:29   ` Jani Nikula
2018-11-21 17:20     ` Rodrigo Vivi
2018-11-22  0:14     ` Lucas De Marchi
2018-11-17  1:15 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: allow to load DMC firmware on next gen Patchwork
2018-11-18 21:24 ` ✓ Fi.CI.BAT: success " Patchwork
2018-11-18 22:41 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-11-19 17:50 ` [PATCH 1/2] " Rodrigo Vivi
2018-11-19 18:24 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork
2018-11-20  0:04 ` ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.