projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0f8296)
drm/i915/huc: Load HuC on Coffee Lake
authorAnusha Srivatsa <anusha.srivatsa@intel.com>
Thu, 8 Jun 2017 23:48:24 +0000 (16:48 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 9 Jun 2017 18:57:16 +0000 (11:57 -0700)
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>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1496965704-23610-2-git-send-email-anusha.srivatsa@intel.com
drivers/gpu/drm/i915/intel_huc.c patch | blob | blame | history

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index f5eb18d0e2d139e8a0609c59363344c11d0b280a..6145fa0d6773f1f29664c88df1ea48f52f7c2b94 100644 (file)
--- 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;