From: Tom O'Rourke <Tom.O'rou...@intel.com>
Adds has_slpc to broxton info and adds broxton firmware version check
to sanitize_slpc_option.
v1: Adjusted slpc version check for major version 8.
Added message if version mismatch happens for easier debug. (Sagar)
v2-v3: Rebase.
v4: Commit message update.
v5: Rebase.
Signed-off-by: Tom O'Rourke <Tom.O'rou...@intel.com>
Signed-off-by: Sagar Arun Kamble <sagar.a.kam...@intel.com>
---
drivers/gpu/drm/i915/i915_pci.c | 1 +
drivers/gpu/drm/i915/intel_guc_loader.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index a1eb92d..8250799 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -365,6 +365,7 @@
.has_hw_contexts = 1,
.has_logical_ring_contexts = 1,
.has_guc = 1,
+ .has_slpc = 1,
.ddb_size = 512,
GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
b/drivers/gpu/drm/i915/intel_guc_loader.c
index 8e99155..e5b35cd 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -177,8 +177,11 @@ void sanitize_slpc_option(struct drm_i915_private
*dev_priv)
if (!i915.enable_guc_submission)
i915.enable_slpc = 0;
- if (IS_SKYLAKE(dev_priv) && (guc_fw->guc_fw_major_found != 9))
+ if ((IS_SKYLAKE(dev_priv) && (guc_fw->guc_fw_major_found != 9))
+ || (IS_BROXTON(dev_priv) && (guc_fw->guc_fw_major_found != 9))) {
+ DRM_INFO("SLPC not supported with current GuC firmware\n");
i915.enable_slpc = 0;
+ }
}
static u32 get_gttype(struct drm_i915_private *dev_priv)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
