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

Message ID 1496965704-23610-2-git-send-email-anusha.srivatsa@intel.com
State New
Headers show

Commit Message

Srivatsa, Anusha June 8, 2017, 11:48 p.m. UTC
Coffee Lake reuses Kabylake's HUC firmware.

v2: Change Coffeelake to Coffee Lake

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

Lukasz Fiedorowicz June 9, 2017, 12:03 p.m. UTC | #1
On Thu, 2017-06-08 at 16:48 -0700, Anusha Srivatsa wrote:
> Coffee Lake reuses Kabylake's HUC firmware.

> 

> v2: Change Coffeelake to Coffee Lake

> 

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

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


Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>


-Lukasz

> ---

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

>  1 file changed, 1 insertion(+), 1 deletion(-)
Rodrigo Vivi June 9, 2017, 7:06 p.m. UTC | #2
Patches merged to dinq.
Thanks for the patches and review.

On Fri, Jun 9, 2017 at 5:03 AM, Fiedorowicz, Lukasz
<lukasz.fiedorowicz@intel.com> wrote:
> On Thu, 2017-06-08 at 16:48 -0700, Anusha Srivatsa wrote:
>> Coffee Lake reuses Kabylake's HUC firmware.
>>
>> v2: Change Coffeelake to Coffee Lake
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
> Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
>
> -Lukasz
>
>> ---
>>  drivers/gpu/drm/i915/intel_huc.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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;