FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
2afba81c7909ac259720c0d3e7616cf54d4a5368Mon Sep 17 00:00:00 2001
From: Anusha Srivatsa <[email protected]>
Date: Wed, 3 Jan 2018 11:03:45 -0800
Subject: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
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)
drivers/gpu/drm/i915/intel_guc_fw.c +0 -9
@@ -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));
drivers/gpu/drm/i915/intel_huc.c +0 -11
@@ -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));
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/glk: Disable Guc and HuC on GLK
From: Anusha Srivatsa <[email protected]>
commit 2afba81c7909ac259720c0d3e7616cf54d4a5368 upstream.
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)
--- drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- drivers/gpu/drm/i915/intel_huc.c | 11 ----------- 2 files changed, 20 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +0 -9
@@ -39,9 +39,6 @@#define KBL_FW_MAJOR 9#define KBL_FW_MINOR 14 -#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) -/** * intel_guc_fw_select() - selects GuC firmware for uploading *
@@ -85,10 +80,6 @@ int intel_guc_fw_select(struct intel_guc *guc) 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_ERROR ("No GuC firmware known for platform with GuC!\n" );return -ENOENT ;
drivers/gpu/drm/i915/intel_huc.c +0 -11
@@ -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) -/** * intel_huc_select_fw() - selects HuC firmware for loading * @huc: intel_huc struct
@@ -103,10 +96,6 @@ void intel_huc_select_fw(struct intel_huc *huc) 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_ERROR ("No HuC firmware known for platform with HuC!\n" );return ;
Signature · 1 line
2.13.6
Greg KH
maintainerRe: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
Quoted 23 lines · Rodrigo Vivi
From: Anusha Srivatsa <[email protected]>
commit
2afba81c7909ac259720c0d3e7616cf54d4a5368upstream.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 <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Fixes 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")Fixes db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")Reviewed-by Michal Wajdeczko <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)Signed-off-by Rodrigo Vivi <[email protected]>
Quoted 4 lines
--- drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- drivers/gpu/drm/i915/intel_huc.c | 11 ----------- 2 files changed, 20 deletions(-)
What stable kernel tree(s) is this for?
thanks,
greg k-h
Rodrigo Vivi
maintainerRe: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
Quoted 29 lines · Greg KH
Quoted 23 lines · Rodrigo Vivi
From: Anusha Srivatsa <[email protected]>
commit
2afba81c7909ac259720c0d3e7616cf54d4a5368upstream.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 <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Fixes 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")Fixes db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")Reviewed-by Michal Wajdeczko <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)Signed-off-by Rodrigo Vivi <[email protected]>Quoted 4 lines
--- drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- drivers/gpu/drm/i915/intel_huc.c | 11 ----------- 2 files changed, 20 deletions(-)
Quoted 1 line
What stable kernel tree(s) is this for?
I'm sorry, I assumed that the in-reply-to for them individually would be enough. I will resent both mentioning the version along with
commit 2afba81c7909ac259720c0d3e7616cf54d4a5368 upstream.
Quoted 8 lines
thanks,
greg k-h
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/glk: Disable Guc and HuC on GLK
In reply to [email protected]From: Anusha Srivatsa <[email protected]>
commit 2afba81c7909ac259720c0d3e7616cf54d4a5368 upstream. for linux stable 4.15.
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)
--- drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- drivers/gpu/drm/i915/intel_huc.c | 11 ----------- 2 files changed, 20 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +0 -9
@@ -39,9 +39,6 @@#define KBL_FW_MAJOR 9#define KBL_FW_MINOR 14 -#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) -/** * intel_guc_fw_select() - selects GuC firmware for uploading *
@@ -85,10 +80,6 @@ int intel_guc_fw_select(struct intel_guc *guc) 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_ERROR ("No GuC firmware known for platform with GuC!\n" );return -ENOENT ;
drivers/gpu/drm/i915/intel_huc.c +0 -11
@@ -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) -/** * intel_huc_select_fw() - selects HuC firmware for loading * @huc: intel_huc struct
@@ -103,10 +96,6 @@ void intel_huc_select_fw(struct intel_huc *huc) 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_ERROR ("No HuC firmware known for platform with HuC!\n" );return ;
Signature · 1 line
2.13.6