[2/2] drm/i915/huc: Load HuC on Coffeelake
diff mbox

Message ID 1496860981-31886-2-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 HUC firmware.

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

Comments

Rodrigo Vivi June 7, 2017, 9:41 p.m. UTC | #1
Same comments I put on GuC patch are valid here...

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


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

> 

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

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

> ---

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

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

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

> index f5eb18d0e..6145fa0 100644

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

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

> @@ -167,7 +167,7 @@ void intel_huc_select_fw(struct intel_huc *huc)

>  		huc->fw.path = I915_BXT_HUC_UCODE;

>  		huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;

>  		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;

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

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

>  		huc->fw.path = I915_KBL_HUC_UCODE;

>  		huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;

>  		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;
Dhinakaran Pandiyan June 7, 2017, 10:46 p.m. UTC | #2
On Wed, 2017-06-07 at 11:43 -0700, Anusha Srivatsa wrote:
> Coffeelake reuses Kabylake's HUC firmware.


s/Coffeelake/Coffee Lake 
That's how the other patches have it :)

> 

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

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

> ---

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

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

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

> index f5eb18d0e..6145fa0 100644

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

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

> @@ -167,7 +167,7 @@ void intel_huc_select_fw(struct intel_huc *huc)

>  		huc->fw.path = I915_BXT_HUC_UCODE;

>  		huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;

>  		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;

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

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

>  		huc->fw.path = I915_KBL_HUC_UCODE;

>  		huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;

>  		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;
Srivatsa, Anusha June 7, 2017, 10:48 p.m. UTC | #3
>-----Original Message-----

>From: Pandiyan, Dhinakaran

>Sent: Wednesday, June 7, 2017 3:46 PM

>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>

>Cc: intel-gfx@lists.freedesktop.org; Vivi, Rodrigo <rodrigo.vivi@intel.com>

>Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/huc: Load HuC on Coffeelake

>

>On Wed, 2017-06-07 at 11:43 -0700, Anusha Srivatsa wrote:

>> Coffeelake reuses Kabylake's HUC firmware.

>

>s/Coffeelake/Coffee Lake

>That's how the other patches have it :)


Oh yes. Thanks DK.

Anusha

>>

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

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

>> ---

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

>>  1 file changed, 1 insertion(+), 1 deletion(-)

>>

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

>b/drivers/gpu/drm/i915/intel_huc.c

>> index f5eb18d0e..6145fa0 100644

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

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

>> @@ -167,7 +167,7 @@ void intel_huc_select_fw(struct intel_huc *huc)

>>  		huc->fw.path = I915_BXT_HUC_UCODE;

>>  		huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;

>>  		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;

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

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

>>  		huc->fw.path = I915_KBL_HUC_UCODE;

>>  		huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;

>>  		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index f5eb18d0e..6145fa0 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -167,7 +167,7 @@  void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.path = I915_BXT_HUC_UCODE;
 		huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;
-	} else if (IS_KABYLAKE(dev_priv)) {
+	} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
 		huc->fw.path = I915_KBL_HUC_UCODE;
 		huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;