[1/2] drm/i915/guc: Load GuC on CFL
diff mbox

Message ID 1496860981-31886-1-git-send-email-anusha.srivatsa@intel.com
State New
Headers show

Commit Message

Srivatsa, Anusha June 7, 2017, 6:43 p.m. UTC
Coffeelake reuses Kabylake's GuC.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c         | 1 +
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Rodrigo Vivi June 7, 2017, 9:40 p.m. UTC | #1
With this approach we need to have in mind that any new kbl firmware
version needs to be validated on both kbl and cfl by our QA before
publishing.

However the differences are really minimal if not 0. So publishing 2
identical files with different names maybe doesn't make any sense and
wouldn't save QA effort anyways.

So,
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>



On Wed, 2017-06-07 at 11:43 -0700, Anusha Srivatsa wrote:
> Coffeelake reuses Kabylake's GuC.

> 

> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

> ---

>  drivers/gpu/drm/i915/i915_pci.c         | 1 +

>  drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-

>  2 files changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c

> index d90942c..c356646 100644

> --- a/drivers/gpu/drm/i915/i915_pci.c

> +++ b/drivers/gpu/drm/i915/i915_pci.c

> @@ -435,6 +435,7 @@ static const struct intel_device_info intel_cannonlake_info = {


why is this below cnl?
ok, I need to rebase cfl on top and this will be above so a conflict
that it will probably appear when rebasing this patch either...


>  	BDW_FEATURES, \

>  	.gen = 9, \

>  	.platform = INTEL_COFFEELAKE, \

> +	.has_guc = 1, \

>  	.ddb_size = 896

>  

>  static const struct intel_device_info intel_coffeelake_info = {

> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c

> index d9045b6..8b0ae7f 100644

> --- a/drivers/gpu/drm/i915/intel_guc_loader.c

> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c

> @@ -402,7 +402,7 @@ int intel_guc_select_fw(struct intel_guc *guc)

>  		guc->fw.path = I915_BXT_GUC_UCODE;

>  		guc->fw.major_ver_wanted = BXT_FW_MAJOR;

>  		guc->fw.minor_ver_wanted = BXT_FW_MINOR;

> -	} else if (IS_KABYLAKE(dev_priv)) {

> +	} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {

>  		guc->fw.path = I915_KBL_GUC_UCODE;

>  		guc->fw.major_ver_wanted = KBL_FW_MAJOR;

>  		guc->fw.minor_ver_wanted = KBL_FW_MINOR;

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index d90942c..c356646 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -435,6 +435,7 @@  static const struct intel_device_info intel_cannonlake_info = {
 	BDW_FEATURES, \
 	.gen = 9, \
 	.platform = INTEL_COFFEELAKE, \
+	.has_guc = 1, \
 	.ddb_size = 896
 
 static const struct intel_device_info intel_coffeelake_info = {
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index d9045b6..8b0ae7f 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -402,7 +402,7 @@  int intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.path = I915_BXT_GUC_UCODE;
 		guc->fw.major_ver_wanted = BXT_FW_MAJOR;
 		guc->fw.minor_ver_wanted = BXT_FW_MINOR;
-	} else if (IS_KABYLAKE(dev_priv)) {
+	} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
 		guc->fw.path = I915_KBL_GUC_UCODE;
 		guc->fw.major_ver_wanted = KBL_FW_MAJOR;
 		guc->fw.minor_ver_wanted = KBL_FW_MINOR;