diff mbox

[20/26] drm/i915/slpc: Add broxton support

Message ID 1457483669-155235-21-git-send-email-tom.orourke@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

tom.orourke@intel.com March 9, 2016, 12:34 a.m. UTC 
From: Tom O'Rourke <Tom.O'Rourke@intel.com>

Adds has_slpc to broxton info and adds broxton to
version check. The SLPC interface version 2015.2.4
is found in Broxton Guc v5.

Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c         | 1 +
 drivers/gpu/drm/i915/intel_guc_loader.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index a23d673..7c00246 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -344,6 +344,7 @@  static const struct intel_device_info intel_broxton_info = {
 	.has_ddi = 1,
 	.has_fpga_dbg = 1,
 	.has_fbc = 1,
+	.has_slpc = 1,
 	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 a3848bf..aa6eca9 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -136,7 +136,8 @@  static void slpc_version_check(struct drm_device *dev, struct intel_guc_fw *guc_
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_device_info *info;
 
-	if (IS_SKYLAKE(dev) && (guc_fw->guc_fw_major_found != 6)) {
+	if ((IS_SKYLAKE(dev) && (guc_fw->guc_fw_major_found != 6))
+	     || (IS_BROXTON(dev) && (guc_fw->guc_fw_major_found != 5))) {
 		info = (struct intel_device_info *) &dev_priv->info;
 		info->has_slpc = 0;
 	}