[PATCH v6 05/23] drm/i915/slpc: Sanitize GuC version

Sagar Arun Kamble sagar.a.kamble at intel.com
Thu Mar 16 18:08:10 UTC 2017


From: Tom O'Rourke <Tom.O'Rourke at intel.com>

The SLPC interface is dependent on GuC version.
Only GuC versions known to be compatible are supported here.

SLPC with GuC firmware v9 is supported with this series.
Other platforms and corresponding checks added later in the series.

v1: Updated with modified sanitize_slpc_option in earlier patch.

v2-v3: Rebase.

v4: Updated support for GuC firmware v9.

v5: Commit subject updated.

v6: Commit subject and message update. Add support condition as >=v9.

Signed-off-by: Tom O'Rourke <Tom.O'Rourke at intel.com>
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 31b90fb..1dcfbd5 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -83,6 +83,8 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)
 
 void sanitize_slpc_option(struct drm_i915_private *dev_priv)
 {
+	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
 	/* slpc requires hardware support and compatible firmware */
 	if (!HAS_SLPC(dev_priv))
 		i915.enable_slpc = 0;
@@ -94,6 +96,11 @@ void sanitize_slpc_option(struct drm_i915_private *dev_priv)
 	/* slpc requires guc submission */
 	if (!i915.enable_guc_submission)
 		i915.enable_slpc = 0;
+
+	if (guc_fw->major_ver_found < 9) {
+		DRM_INFO("SLPC not supported with current GuC firmware\n");
+		i915.enable_slpc = 0;
+	}
 }
 
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)
-- 
1.9.1



More information about the Intel-gfx-trybot mailing list