On Wed, Jan 03, 2018 at 07:03:45PM +0000, Anusha Srivatsa wrote:
> Since the firmwares are not yet released to public repo,
> disable them on Geminilake.
>
> v2: Remove the firmware versions (Michal)
>
> v3: Remove unwanted defines (Rodrigo)
> Correct commit message (Michal)
>
> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx>
> Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")
> Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")
> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Now merged. Thanks for the patch.
> ---
> drivers/gpu/drm/i915/intel_guc_fw.c | 9 ---------
> drivers/gpu/drm/i915/intel_huc.c | 11 -----------
> 2 files changed, 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index cbc51c9..3b09329 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -39,9 +39,6 @@
> #define KBL_FW_MAJOR 9
> #define KBL_FW_MINOR 39
>
> -#define GLK_FW_MAJOR 10
> -#define GLK_FW_MINOR 56
> -
> #define GUC_FW_PATH(platform, major, minor) \
> "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
>
> @@ -54,8 +51,6 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
> #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)
> MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
>
> -#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
> -
> static void guc_fw_select(struct intel_uc_fw *guc_fw)
> {
> struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
> @@ -82,10 +77,6 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
> guc_fw->path = I915_KBL_GUC_UCODE;
> guc_fw->major_ver_wanted = KBL_FW_MAJOR;
> guc_fw->minor_ver_wanted = KBL_FW_MINOR;
> - } else if (IS_GEMINILAKE(dev_priv)) {
> - guc_fw->path = I915_GLK_GUC_UCODE;
> - guc_fw->major_ver_wanted = GLK_FW_MAJOR;
> - guc_fw->minor_ver_wanted = GLK_FW_MINOR;
> } else {
> DRM_WARN("%s: No firmware known for this platform!\n",
> intel_uc_fw_type_repr(guc_fw->type));
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index 974be3d..8ed0518 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -54,10 +54,6 @@
> #define KBL_HUC_FW_MINOR 00
> #define KBL_BLD_NUM 1810
>
> -#define GLK_HUC_FW_MAJOR 02
> -#define GLK_HUC_FW_MINOR 00
> -#define GLK_BLD_NUM 1748
> -
> #define HUC_FW_PATH(platform, major, minor, bld_num) \
> "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
> __stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -74,9 +70,6 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
> KBL_HUC_FW_MINOR, KBL_BLD_NUM)
> MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>
> -#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
> - GLK_HUC_FW_MINOR, GLK_BLD_NUM)
> -
> static void huc_fw_select(struct intel_uc_fw *huc_fw)
> {
> struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> @@ -103,10 +96,6 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
> 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;
> - } else if (IS_GEMINILAKE(dev_priv)) {
> - huc_fw->path = I915_GLK_HUC_UCODE;
> - huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
> - huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
> } else {
> DRM_WARN("%s: No firmware known for this platform!\n",
> intel_uc_fw_type_repr(huc_fw->type));
> --
> 2.7.4
>