* FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.15-stable tree
@ 2018-03-12 12:43 gregkh
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
2018-03-13 22:57 ` Rodrigo Vivi
0 siblings, 2 replies; 23+ messages in thread
From: gregkh @ 2018-03-12 12:43 UTC (permalink / raw)
To: anusha.srivatsa, michal.wajdeczko, rodrigo.vivi, stable; +Cc: stable
The 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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 2afba81c7909ac259720c0d3e7616cf54d4a5368 Mon Sep 17 00:00:00 2001
From: Anusha Srivatsa <anusha.srivatsa@intel.com>
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)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index cbc51c960425..3b0932942857 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 974be3defa70..8ed05182f944 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));
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.15-stable tree gregkh
@ 2018-03-12 22:34 ` Rodrigo Vivi
2018-03-13 8:46 ` Greg KH
2018-03-13 22:57 ` Rodrigo Vivi
1 sibling, 1 reply; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-12 22:34 UTC (permalink / raw)
To: gregkh; +Cc: stable, anusha.srivatsa, intel-gfx, Michal Wajdeczko, Rodrigo Vivi
From: Anusha Srivatsa <anusha.srivatsa@intel.com>
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)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
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 ef67a36354c5..cd05bdea46d3 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 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;
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index c8a48cbc2b7d..c3460c4a7b54 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)
-
/**
* 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;
--
2.13.6
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
@ 2018-03-13 8:46 ` Greg KH
2018-03-13 22:41 ` Rodrigo Vivi
0 siblings, 1 reply; 23+ messages in thread
From: Greg KH @ 2018-03-13 8:46 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: stable, anusha.srivatsa, intel-gfx, Michal Wajdeczko
On Mon, Mar 12, 2018 at 03:34:57PM -0700, Rodrigo Vivi wrote:
> From: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
> 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)
>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> 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@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
> (cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-13 8:46 ` Greg KH
@ 2018-03-13 22:41 ` Rodrigo Vivi
0 siblings, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-13 22:41 UTC (permalink / raw)
To: Greg KH; +Cc: intel-gfx, stable
On Tue, Mar 13, 2018 at 09:46:32AM +0100, Greg KH wrote:
> On Mon, Mar 12, 2018 at 03:34:57PM -0700, Rodrigo Vivi wrote:
> > From: Anusha Srivatsa <anusha.srivatsa@intel.com>
> >
> > 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)
> >
> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > 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@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
> > (cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > 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?
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.
>
> thanks,
>
> greg k-h
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
@ 2018-03-13 22:41 ` Rodrigo Vivi
0 siblings, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-13 22:41 UTC (permalink / raw)
To: Greg KH; +Cc: intel-gfx, stable
On Tue, Mar 13, 2018 at 09:46:32AM +0100, Greg KH wrote:
> On Mon, Mar 12, 2018 at 03:34:57PM -0700, Rodrigo Vivi wrote:
> > From: Anusha Srivatsa <anusha.srivatsa@intel.com>
> >
> > 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)
> >
> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > 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@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
> > (cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > 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?
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.
>
> thanks,
>
> greg k-h
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.15-stable tree gregkh
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
@ 2018-03-13 22:57 ` Rodrigo Vivi
1 sibling, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-13 22:57 UTC (permalink / raw)
To: gregkh; +Cc: stable, anusha.srivatsa, intel-gfx, Michal Wajdeczko, Rodrigo Vivi
From: Anusha Srivatsa <anusha.srivatsa@intel.com>
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)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
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 ef67a36354c5..cd05bdea46d3 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 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;
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index c8a48cbc2b7d..c3460c4a7b54 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)
-
/**
* 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;
--
2.13.6
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.14-stable tree gregkh
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
@ 2018-03-13 22:58 ` Rodrigo Vivi
1 sibling, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-13 22:58 UTC (permalink / raw)
To: gregkh; +Cc: stable, anusha.srivatsa, intel-gfx, Rodrigo Vivi, Michal Wajdeczko
commit 2afba81c7909ac259720c0d3e7616cf54d4a5368 upstream
for linux stable 4.14.
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@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 9 ---------
drivers/gpu/drm/i915/intel_huc.c | 11 -----------
2 files changed, 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 8b0ae7fce7f2..67a7d6eafd31 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,9 +61,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"
@@ -76,8 +73,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 u32 get_gttype(struct drm_i915_private *dev_priv)
{
@@ -406,10 +401,6 @@ int intel_guc_select_fw(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;
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 6145fa0d6773..82224efe1ad8 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -52,10 +52,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"
@@ -72,9 +68,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)
-
/**
* huc_ucode_xfer() - DMA's the firmware
* @dev_priv: the drm_i915_private device
@@ -171,10 +164,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;
--
2.13.6
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.14-stable tree gregkh
@ 2018-03-12 22:34 ` Rodrigo Vivi
2018-03-13 22:58 ` Rodrigo Vivi
1 sibling, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-03-12 22:34 UTC (permalink / raw)
To: gregkh; +Cc: stable, anusha.srivatsa, intel-gfx, Rodrigo Vivi, Michal Wajdeczko
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)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com
(cherry picked from commit a76050a4837860fcadb6ca11d69d41e08f4090d8)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 9 ---------
drivers/gpu/drm/i915/intel_huc.c | 11 -----------
2 files changed, 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 8b0ae7fce7f2..67a7d6eafd31 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,9 +61,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"
@@ -76,8 +73,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 u32 get_gttype(struct drm_i915_private *dev_priv)
{
@@ -406,10 +401,6 @@ int intel_guc_select_fw(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;
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 6145fa0d6773..82224efe1ad8 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -52,10 +52,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"
@@ -72,9 +68,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)
-
/**
* huc_ucode_xfer() - DMA's the firmware
* @dev_priv: the drm_i915_private device
@@ -171,10 +164,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;
--
2.13.6
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2018-01-03 19:03 Anusha Srivatsa
@ 2018-01-04 22:46 ` Rodrigo Vivi
0 siblings, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-01-04 22:46 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, Michal Wajdeczko, stable
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@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> 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@intel.com>
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
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
@ 2018-01-04 22:46 ` Rodrigo Vivi
0 siblings, 0 replies; 23+ messages in thread
From: Rodrigo Vivi @ 2018-01-04 22:46 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, stable
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@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> 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@intel.com>
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
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
@ 2018-01-03 19:03 Anusha Srivatsa
2018-01-04 22:46 ` Rodrigo Vivi
0 siblings, 1 reply; 23+ messages in thread
From: Anusha Srivatsa @ 2018-01-03 19:03 UTC (permalink / raw)
To: intel-gfx; +Cc: Anusha Srivatsa, Michal Wajdeczko, Rodrigo Vivi, stable
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@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-27 20:53 ` Michal Wajdeczko
@ 2018-01-02 19:44 ` Srivatsa, Anusha
0 siblings, 0 replies; 23+ messages in thread
From: Srivatsa, Anusha @ 2018-01-02 19:44 UTC (permalink / raw)
To: Wajdeczko, Michal, intel-gfx; +Cc: Vivi, Rodrigo
>-----Original Message-----
>From: Wajdeczko, Michal
>Sent: Wednesday, December 27, 2017 12:53 PM
>To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
><anusha.srivatsa@intel.com>
>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
>Subject: Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
>
>On Sat, 23 Dec 2017 01:05:14 +0100, Anusha Srivatsa
><anusha.srivatsa@intel.com> wrote:
>
>> Since the firmwares are released yet to public repo,
> ^^^
>s/released/not released
Oooops .... Thanks a lot for the catch.
Anusha
>> disable them on Geminilake.
>>
>> v2: Remove the firmware versions (Michal)
>>
>> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-28 16:08 ` Rodrigo Vivi
@ 2018-01-02 19:43 ` Srivatsa, Anusha
0 siblings, 0 replies; 23+ messages in thread
From: Srivatsa, Anusha @ 2018-01-02 19:43 UTC (permalink / raw)
To: Vivi, Rodrigo; +Cc: intel-gfx
>-----Original Message-----
>From: Vivi, Rodrigo
>Sent: Thursday, December 28, 2017 8:08 AM
>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; Wajdeczko, Michal
><Michal.Wajdeczko@intel.com>
>Subject: Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
>
>On Sat, Dec 23, 2017 at 12:05:14AM +0000, Anusha Srivatsa wrote:
>> Since the firmwares are released yet to public repo, disable them on
>> Geminilake.
>>
>> v2: Remove the firmware versions (Michal)
>>
>> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
>Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")
>Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")
>Cc: <stable@vger.kernel.org> # v4.13+
>
>What about a revert on those 2 patches?
Revert touches source files which no longer .... I would prefer having this patch instead.
>I'm fine with one patch approach, but the fixes tag needs to be here anyways.
Yes, thanks for pointing the suitable tags.
>> ---
>> drivers/gpu/drm/i915/intel_guc_fw.c | 4 ----
>> drivers/gpu/drm/i915/intel_huc.c | 4 ----
>> 2 files changed, 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c
>> b/drivers/gpu/drm/i915/intel_guc_fw.c
>> index cbc51c9..252b475 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
>> @@ -82,10 +82,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;
>
>But also, please it is mandatory to also remove the now unused
>I915_GLK_GUC_UCODE, GLK_FW_MAJOR, and GLK_FW_MINOR
Will change in next revision.
Thanks a lot for the feedback.
>> } 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..3f28ae0 100644
>> --- a/drivers/gpu/drm/i915/intel_huc.c
>> +++ b/drivers/gpu/drm/i915/intel_huc.c
>> @@ -103,10 +103,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;
>
>and unused I915_GLK_HUC_UCODE, GLK_HUC_FW_MAJOR, and
>GLK_HUC_FW_MINOR.
Sure.
BR,
Anusha
>> } else {
>> DRM_WARN("%s: No firmware known for this platform!\n",
>> intel_uc_fw_type_repr(huc_fw->type));
>> --
>> 2.7.4
>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-23 0:05 Anusha Srivatsa
2017-12-27 20:53 ` Michal Wajdeczko
@ 2017-12-28 16:08 ` Rodrigo Vivi
2018-01-02 19:43 ` Srivatsa, Anusha
1 sibling, 1 reply; 23+ messages in thread
From: Rodrigo Vivi @ 2017-12-28 16:08 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
On Sat, Dec 23, 2017 at 12:05:14AM +0000, Anusha Srivatsa wrote:
> Since the firmwares are released yet to public repo,
> disable them on Geminilake.
>
> v2: Remove the firmware versions (Michal)
>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")
Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")
Cc: <stable@vger.kernel.org> # v4.13+
What about a revert on those 2 patches?
I'm fine with one patch approach, but the fixes tag needs to be here anyways.
> ---
> drivers/gpu/drm/i915/intel_guc_fw.c | 4 ----
> drivers/gpu/drm/i915/intel_huc.c | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index cbc51c9..252b475 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -82,10 +82,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;
But also, please it is mandatory to also remove the now unused I915_GLK_GUC_UCODE,
GLK_FW_MAJOR, and 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..3f28ae0 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -103,10 +103,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;
and unused I915_GLK_HUC_UCODE, GLK_HUC_FW_MAJOR, and 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
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-23 0:05 Anusha Srivatsa
@ 2017-12-27 20:53 ` Michal Wajdeczko
2018-01-02 19:44 ` Srivatsa, Anusha
2017-12-28 16:08 ` Rodrigo Vivi
1 sibling, 1 reply; 23+ messages in thread
From: Michal Wajdeczko @ 2017-12-27 20:53 UTC (permalink / raw)
To: intel-gfx, Anusha Srivatsa; +Cc: Rodrigo Vivi
On Sat, 23 Dec 2017 01:05:14 +0100, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Since the firmwares are released yet to public repo,
^^^
s/released/not released
> disable them on Geminilake.
>
> v2: Remove the firmware versions (Michal)
>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
@ 2017-12-23 0:05 Anusha Srivatsa
2017-12-27 20:53 ` Michal Wajdeczko
2017-12-28 16:08 ` Rodrigo Vivi
0 siblings, 2 replies; 23+ messages in thread
From: Anusha Srivatsa @ 2017-12-23 0:05 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Since the firmwares are released yet to public repo,
disable them on Geminilake.
v2: Remove the firmware versions (Michal)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_fw.c | 4 ----
drivers/gpu/drm/i915/intel_huc.c | 4 ----
2 files changed, 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index cbc51c9..252b475 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -82,10 +82,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..3f28ae0 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -103,10 +103,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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-18 19:25 ` Srivatsa, Anusha
@ 2017-12-18 20:56 ` Michal Wajdeczko
0 siblings, 0 replies; 23+ messages in thread
From: Michal Wajdeczko @ 2017-12-18 20:56 UTC (permalink / raw)
To: Vivi, Rodrigo, Wajdeczko, Michal, Srivatsa, Anusha; +Cc: intel-gfx
On Mon, 18 Dec 2017 20:25:17 +0100, Srivatsa, Anusha
<anusha.srivatsa@intel.com> wrote:
>
>
>> -----Original Message-----
>> From: Vivi, Rodrigo
>> Sent: Friday, December 15, 2017 3:03 PM
>> To: Wajdeczko, Michal <Michal.Wajdeczko@intel.com>
>> Cc: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
>> <anusha.srivatsa@intel.com>
>> Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on
>> GLK
>>
>> On Fri, Dec 15, 2017 at 06:07:27AM +0000, Michal Wajdeczko wrote:
>>> On Thu, 14 Dec 2017 23:30:56 +0100, Srivatsa, Anusha
>>> <anusha.srivatsa@intel.com> wrote:
>>>
>>> >
>>> >
>>> > > -----Original Message-----
>>> > > From: Wajdeczko, Michal
>>> > > Sent: Thursday, December 14, 2017 2:18 PM
>>> > > To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
>>> > > <anusha.srivatsa@intel.com>
>>> > > Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
>>> > > Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC
>>> > > on GLK
>>> > >
>>> > > On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
>>> > > <anusha.srivatsa@intel.com> wrote:
>>> > >
>>> > > > Since the firmwares are released yet to public repo, disable
>>> > > > them on Geminilake.
>>> > > >
>>> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> > > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> > > > ---
>>> > > > drivers/gpu/drm/i915/i915_pci.c | 5 +++++
>>> > > > 1 file changed, 5 insertions(+)
>>> > > >
>>> > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c
>>> > > > b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
>>> > > > --- a/drivers/gpu/drm/i915/i915_pci.c
>>> > > > +++ b/drivers/gpu/drm/i915/i915_pci.c
>>> > > > @@ -521,6 +521,11 @@ static const struct intel_device_info
>>> > > > intel_geminilake_info __initconst = {
>>> > > > GEN9_LP_FEATURES,
>>> > > > .platform = INTEL_GEMINILAKE,
>>> > > > .ddb_size = 1024,
>>> > > > + /* FIXME Geminilake supports GuC but currently firmwares
>>> > > > + * have not made it to public repo. Lets disable the support
>>> > > > + * as a temporary fix.
>>> > > > + */
>>> > > > + .has_guc = 0,
>>> > >
>>> > > Maybe better place to put this fix is __get_platform_enable_guc()
>>> > > like in [1] [1] https://patchwork.freedesktop.org/patch/192006/
>>> >
>>> > Michal,
>>> > Hmm the reference patch is controlling guc/huc through a module
>>> > parameter but wont the above approach be neater platform wise?
>>>
>>> With your patch it would be impossible to check even preliminary
>>> firmwares from non-public repo without recompilation of the driver.
>>>
>>> While with variant below it would just require changing modparams like:
>>> enable_guc=1
>>> guc_firmware_path=preliminary/glk.bin
>>
>> This is a fair point imo. With has_guc=0 you remove the possibility of
>> testing
>> preliminary GuC/HuC without a kernel patch...
>>
>>>
>>> Note that auto mode (enable_guc=-1) will still keep GuC disabled for
>>> GLK.
>>
>> ... but I believe that the main point here is that if we don't have a
>> public image it
>> doesn't exist from the upstream perspective.
>
> Correct
>> The ideal is not need this patch and releasing firmware sooner. I see
>> same
>> happening for all upcoming platforms...
>>
>> So, whatever we decide for this case needs to cover future cases as
>> well.
>
> I agree. While both the places discussed is good to make this change, I
> am inclining towards making at the platform definition level. I do need
> more feedback on this since we want that to be the norm moving forward.
>
There is a yet another option for now: remove GuC/Huc firmware names.
} 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 {
And the norm for the future: do not define GuC/HuC firmware names without
having those images available in public.
Michal
> Anusha
>> Thanks,
>> Rodrigo.
>>
>>>
>>> Michal
>>>
>>> >
>>> > Anusha
>>> > > diff --git a/drivers/gpu/drm/i915/intel_uc.c
>>> > > b/drivers/gpu/drm/i915/intel_uc.c index 49bccc9..22b0afe 100644
>>> > > --- a/drivers/gpu/drm/i915/intel_uc.c
>>> > > +++ b/drivers/gpu/drm/i915/intel_uc.c
>>> > > @@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
>>> > > drm_i915_private *dev_priv)
>>> > > enable_guc |= ENABLE_GUC_LOAD_HUC;
>>> > >
>>> > > /* Any platform specific fine-tuning can be done here */
>>> > > + if (IS_GEMINILAKE(dev_priv))
>>> > > + enable_guc = 0; /* no firmware on CI machines */
>>> > >
>>> > > return enable_guc;
>>> > > }
>>> > >
>>> > >
>>> > > > GLK_COLORS,
>>> > > > };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-15 23:02 ` Rodrigo Vivi
@ 2017-12-18 19:25 ` Srivatsa, Anusha
2017-12-18 20:56 ` Michal Wajdeczko
0 siblings, 1 reply; 23+ messages in thread
From: Srivatsa, Anusha @ 2017-12-18 19:25 UTC (permalink / raw)
To: Vivi, Rodrigo, Wajdeczko, Michal; +Cc: intel-gfx
>-----Original Message-----
>From: Vivi, Rodrigo
>Sent: Friday, December 15, 2017 3:03 PM
>To: Wajdeczko, Michal <Michal.Wajdeczko@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
><anusha.srivatsa@intel.com>
>Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
>
>On Fri, Dec 15, 2017 at 06:07:27AM +0000, Michal Wajdeczko wrote:
>> On Thu, 14 Dec 2017 23:30:56 +0100, Srivatsa, Anusha
>> <anusha.srivatsa@intel.com> wrote:
>>
>> >
>> >
>> > > -----Original Message-----
>> > > From: Wajdeczko, Michal
>> > > Sent: Thursday, December 14, 2017 2:18 PM
>> > > To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
>> > > <anusha.srivatsa@intel.com>
>> > > Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
>> > > Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC
>> > > on GLK
>> > >
>> > > On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
>> > > <anusha.srivatsa@intel.com> wrote:
>> > >
>> > > > Since the firmwares are released yet to public repo, disable
>> > > > them on Geminilake.
>> > > >
>> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> > > > ---
>> > > > drivers/gpu/drm/i915/i915_pci.c | 5 +++++
>> > > > 1 file changed, 5 insertions(+)
>> > > >
>> > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c
>> > > > b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
>> > > > --- a/drivers/gpu/drm/i915/i915_pci.c
>> > > > +++ b/drivers/gpu/drm/i915/i915_pci.c
>> > > > @@ -521,6 +521,11 @@ static const struct intel_device_info
>> > > > intel_geminilake_info __initconst = {
>> > > > GEN9_LP_FEATURES,
>> > > > .platform = INTEL_GEMINILAKE,
>> > > > .ddb_size = 1024,
>> > > > + /* FIXME Geminilake supports GuC but currently firmwares
>> > > > + * have not made it to public repo. Lets disable the support
>> > > > + * as a temporary fix.
>> > > > + */
>> > > > + .has_guc = 0,
>> > >
>> > > Maybe better place to put this fix is __get_platform_enable_guc()
>> > > like in [1] [1] https://patchwork.freedesktop.org/patch/192006/
>> >
>> > Michal,
>> > Hmm the reference patch is controlling guc/huc through a module
>> > parameter but wont the above approach be neater platform wise?
>>
>> With your patch it would be impossible to check even preliminary
>> firmwares from non-public repo without recompilation of the driver.
>>
>> While with variant below it would just require changing modparams like:
>> enable_guc=1
>> guc_firmware_path=preliminary/glk.bin
>
>This is a fair point imo. With has_guc=0 you remove the possibility of testing
>preliminary GuC/HuC without a kernel patch...
>
>>
>> Note that auto mode (enable_guc=-1) will still keep GuC disabled for GLK.
>
>... but I believe that the main point here is that if we don't have a public image it
>doesn't exist from the upstream perspective.
Correct
>The ideal is not need this patch and releasing firmware sooner. I see same
>happening for all upcoming platforms...
>
>So, whatever we decide for this case needs to cover future cases as well.
I agree. While both the places discussed is good to make this change, I am inclining towards making at the platform definition level. I do need more feedback on this since we want that to be the norm moving forward.
Anusha
>Thanks,
>Rodrigo.
>
>>
>> Michal
>>
>> >
>> > Anusha
>> > > diff --git a/drivers/gpu/drm/i915/intel_uc.c
>> > > b/drivers/gpu/drm/i915/intel_uc.c index 49bccc9..22b0afe 100644
>> > > --- a/drivers/gpu/drm/i915/intel_uc.c
>> > > +++ b/drivers/gpu/drm/i915/intel_uc.c
>> > > @@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
>> > > drm_i915_private *dev_priv)
>> > > enable_guc |= ENABLE_GUC_LOAD_HUC;
>> > >
>> > > /* Any platform specific fine-tuning can be done here */
>> > > + if (IS_GEMINILAKE(dev_priv))
>> > > + enable_guc = 0; /* no firmware on CI machines */
>> > >
>> > > return enable_guc;
>> > > }
>> > >
>> > >
>> > > > GLK_COLORS,
>> > > > };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-15 6:07 ` Michal Wajdeczko
@ 2017-12-15 23:02 ` Rodrigo Vivi
2017-12-18 19:25 ` Srivatsa, Anusha
0 siblings, 1 reply; 23+ messages in thread
From: Rodrigo Vivi @ 2017-12-15 23:02 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
On Fri, Dec 15, 2017 at 06:07:27AM +0000, Michal Wajdeczko wrote:
> On Thu, 14 Dec 2017 23:30:56 +0100, Srivatsa, Anusha
> <anusha.srivatsa@intel.com> wrote:
>
> >
> >
> > > -----Original Message-----
> > > From: Wajdeczko, Michal
> > > Sent: Thursday, December 14, 2017 2:18 PM
> > > To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
> > > <anusha.srivatsa@intel.com>
> > > Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
> > > Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC
> > > on GLK
> > >
> > > On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
> > > <anusha.srivatsa@intel.com> wrote:
> > >
> > > > Since the firmwares are released yet to public repo, disable them on
> > > > Geminilake.
> > > >
> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > > > ---
> > > > drivers/gpu/drm/i915/i915_pci.c | 5 +++++
> > > > 1 file changed, 5 insertions(+)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c
> > > > b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
> > > > --- a/drivers/gpu/drm/i915/i915_pci.c
> > > > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > > > @@ -521,6 +521,11 @@ static const struct intel_device_info
> > > > intel_geminilake_info __initconst = {
> > > > GEN9_LP_FEATURES,
> > > > .platform = INTEL_GEMINILAKE,
> > > > .ddb_size = 1024,
> > > > + /* FIXME Geminilake supports GuC but currently firmwares
> > > > + * have not made it to public repo. Lets disable the support
> > > > + * as a temporary fix.
> > > > + */
> > > > + .has_guc = 0,
> > >
> > > Maybe better place to put this fix is __get_platform_enable_guc()
> > > like in [1] [1]
> > > https://patchwork.freedesktop.org/patch/192006/
> >
> > Michal,
> > Hmm the reference patch is controlling guc/huc through a module
> > parameter but wont the above approach be neater platform wise?
>
> With your patch it would be impossible to check even preliminary
> firmwares from non-public repo without recompilation of the driver.
>
> While with variant below it would just require changing modparams like:
> enable_guc=1
> guc_firmware_path=preliminary/glk.bin
This is a fair point imo. With has_guc=0 you remove the possibility
of testing preliminary GuC/HuC without a kernel patch...
>
> Note that auto mode (enable_guc=-1) will still keep GuC disabled for GLK.
... but I believe that the main point here is that if
we don't have a public image it doesn't exist from the upstream perspective.
The ideal is not need this patch and releasing firmware sooner. I see same
happening for all upcoming platforms...
So, whatever we decide for this case needs to cover future cases as well.
Thanks,
Rodrigo.
>
> Michal
>
> >
> > Anusha
> > > diff --git a/drivers/gpu/drm/i915/intel_uc.c
> > > b/drivers/gpu/drm/i915/intel_uc.c
> > > index 49bccc9..22b0afe 100644
> > > --- a/drivers/gpu/drm/i915/intel_uc.c
> > > +++ b/drivers/gpu/drm/i915/intel_uc.c
> > > @@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
> > > drm_i915_private *dev_priv)
> > > enable_guc |= ENABLE_GUC_LOAD_HUC;
> > >
> > > /* Any platform specific fine-tuning can be done here */
> > > + if (IS_GEMINILAKE(dev_priv))
> > > + enable_guc = 0; /* no firmware on CI machines */
> > >
> > > return enable_guc;
> > > }
> > >
> > >
> > > > GLK_COLORS,
> > > > };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-14 22:30 ` Srivatsa, Anusha
@ 2017-12-15 6:07 ` Michal Wajdeczko
2017-12-15 23:02 ` Rodrigo Vivi
0 siblings, 1 reply; 23+ messages in thread
From: Michal Wajdeczko @ 2017-12-15 6:07 UTC (permalink / raw)
To: Wajdeczko, Michal, intel-gfx, Srivatsa, Anusha; +Cc: Vivi, Rodrigo
On Thu, 14 Dec 2017 23:30:56 +0100, Srivatsa, Anusha
<anusha.srivatsa@intel.com> wrote:
>
>
>> -----Original Message-----
>> From: Wajdeczko, Michal
>> Sent: Thursday, December 14, 2017 2:18 PM
>> To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
>> <anusha.srivatsa@intel.com>
>> Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
>> Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on
>> GLK
>>
>> On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
>> <anusha.srivatsa@intel.com> wrote:
>>
>>> Since the firmwares are released yet to public repo, disable them on
>>> Geminilake.
>>>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/i915_pci.c | 5 +++++
>>> 1 file changed, 5 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_pci.c
>>> b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
>>> --- a/drivers/gpu/drm/i915/i915_pci.c
>>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>>> @@ -521,6 +521,11 @@ static const struct intel_device_info
>>> intel_geminilake_info __initconst = {
>>> GEN9_LP_FEATURES,
>>> .platform = INTEL_GEMINILAKE,
>>> .ddb_size = 1024,
>>> + /* FIXME Geminilake supports GuC but currently firmwares
>>> + * have not made it to public repo. Lets disable the support
>>> + * as a temporary fix.
>>> + */
>>> + .has_guc = 0,
>>
>> Maybe better place to put this fix is __get_platform_enable_guc() like
>> in [1] [1]
>> https://patchwork.freedesktop.org/patch/192006/
>
> Michal,
> Hmm the reference patch is controlling guc/huc through a module
> parameter but wont the above approach be neater platform wise?
With your patch it would be impossible to check even preliminary
firmwares from non-public repo without recompilation of the driver.
While with variant below it would just require changing modparams like:
enable_guc=1
guc_firmware_path=preliminary/glk.bin
Note that auto mode (enable_guc=-1) will still keep GuC disabled for GLK.
Michal
>
> Anusha
>> diff --git a/drivers/gpu/drm/i915/intel_uc.c
>> b/drivers/gpu/drm/i915/intel_uc.c
>> index 49bccc9..22b0afe 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.c
>> +++ b/drivers/gpu/drm/i915/intel_uc.c
>> @@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
>> drm_i915_private *dev_priv)
>> enable_guc |= ENABLE_GUC_LOAD_HUC;
>>
>> /* Any platform specific fine-tuning can be done here */
>> + if (IS_GEMINILAKE(dev_priv))
>> + enable_guc = 0; /* no firmware on CI machines */
>>
>> return enable_guc;
>> }
>>
>>
>>> GLK_COLORS,
>>> };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-14 22:17 ` Michal Wajdeczko
@ 2017-12-14 22:30 ` Srivatsa, Anusha
2017-12-15 6:07 ` Michal Wajdeczko
0 siblings, 1 reply; 23+ messages in thread
From: Srivatsa, Anusha @ 2017-12-14 22:30 UTC (permalink / raw)
To: Wajdeczko, Michal, intel-gfx; +Cc: Vivi, Rodrigo
>-----Original Message-----
>From: Wajdeczko, Michal
>Sent: Thursday, December 14, 2017 2:18 PM
>To: intel-gfx@lists.freedesktop.org; Srivatsa, Anusha
><anusha.srivatsa@intel.com>
>Cc: Vivi, Rodrigo <rodrigo.vivi@intel.com>
>Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
>
>On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
><anusha.srivatsa@intel.com> wrote:
>
>> Since the firmwares are released yet to public repo, disable them on
>> Geminilake.
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_pci.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c
>> b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -521,6 +521,11 @@ static const struct intel_device_info
>> intel_geminilake_info __initconst = {
>> GEN9_LP_FEATURES,
>> .platform = INTEL_GEMINILAKE,
>> .ddb_size = 1024,
>> + /* FIXME Geminilake supports GuC but currently firmwares
>> + * have not made it to public repo. Lets disable the support
>> + * as a temporary fix.
>> + */
>> + .has_guc = 0,
>
>Maybe better place to put this fix is __get_platform_enable_guc() like in [1] [1]
>https://patchwork.freedesktop.org/patch/192006/
Michal,
Hmm the reference patch is controlling guc/huc through a module parameter but wont the above approach be neater platform wise?
Anusha
>diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
>index 49bccc9..22b0afe 100644
>--- a/drivers/gpu/drm/i915/intel_uc.c
>+++ b/drivers/gpu/drm/i915/intel_uc.c
>@@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
>drm_i915_private *dev_priv)
> enable_guc |= ENABLE_GUC_LOAD_HUC;
>
> /* Any platform specific fine-tuning can be done here */
>+ if (IS_GEMINILAKE(dev_priv))
>+ enable_guc = 0; /* no firmware on CI machines */
>
> return enable_guc;
> }
>
>
>> GLK_COLORS,
>> };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
2017-12-14 21:58 Anusha Srivatsa
@ 2017-12-14 22:17 ` Michal Wajdeczko
2017-12-14 22:30 ` Srivatsa, Anusha
0 siblings, 1 reply; 23+ messages in thread
From: Michal Wajdeczko @ 2017-12-14 22:17 UTC (permalink / raw)
To: intel-gfx, Anusha Srivatsa; +Cc: Rodrigo Vivi
On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Since the firmwares are released yet to public repo,
> disable them on Geminilake.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/i915_pci.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c
> b/drivers/gpu/drm/i915/i915_pci.c
> index fa67d3d..ddf7530 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -521,6 +521,11 @@ static const struct intel_device_info
> intel_geminilake_info __initconst = {
> GEN9_LP_FEATURES,
> .platform = INTEL_GEMINILAKE,
> .ddb_size = 1024,
> + /* FIXME Geminilake supports GuC but currently firmwares
> + * have not made it to public repo. Lets disable the support
> + * as a temporary fix.
> + */
> + .has_guc = 0,
Maybe better place to put this fix is __get_platform_enable_guc() like in
[1]
[1] https://patchwork.freedesktop.org/patch/192006/
diff --git a/drivers/gpu/drm/i915/intel_uc.c
b/drivers/gpu/drm/i915/intel_uc.c
index 49bccc9..22b0afe 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
drm_i915_private *dev_priv)
enable_guc |= ENABLE_GUC_LOAD_HUC;
/* Any platform specific fine-tuning can be done here */
+ if (IS_GEMINILAKE(dev_priv))
+ enable_guc = 0; /* no firmware on CI machines */
return enable_guc;
}
> GLK_COLORS,
> };
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
@ 2017-12-14 21:58 Anusha Srivatsa
2017-12-14 22:17 ` Michal Wajdeczko
0 siblings, 1 reply; 23+ messages in thread
From: Anusha Srivatsa @ 2017-12-14 21:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Since the firmwares are released yet to public repo,
disable them on Geminilake.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/i915_pci.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index fa67d3d..ddf7530 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -521,6 +521,11 @@ static const struct intel_device_info intel_geminilake_info __initconst = {
GEN9_LP_FEATURES,
.platform = INTEL_GEMINILAKE,
.ddb_size = 1024,
+ /* FIXME Geminilake supports GuC but currently firmwares
+ * have not made it to public repo. Lets disable the support
+ * as a temporary fix.
+ */
+ .has_guc = 0,
GLK_COLORS,
};
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2018-03-13 22:58 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.15-stable tree gregkh
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
2018-03-13 8:46 ` Greg KH
2018-03-13 22:41 ` [Intel-gfx] " Rodrigo Vivi
2018-03-13 22:41 ` Rodrigo Vivi
2018-03-13 22:57 ` Rodrigo Vivi
-- strict thread matches above, loose matches on Subject: below --
2018-03-12 12:43 FAILED: patch "[PATCH] drm/i915/glk: Disable Guc and HuC on GLK" failed to apply to 4.14-stable tree gregkh
2018-03-12 22:34 ` [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Rodrigo Vivi
2018-03-13 22:58 ` Rodrigo Vivi
2018-01-03 19:03 Anusha Srivatsa
2018-01-04 22:46 ` Rodrigo Vivi
2018-01-04 22:46 ` Rodrigo Vivi
2017-12-23 0:05 Anusha Srivatsa
2017-12-27 20:53 ` Michal Wajdeczko
2018-01-02 19:44 ` Srivatsa, Anusha
2017-12-28 16:08 ` Rodrigo Vivi
2018-01-02 19:43 ` Srivatsa, Anusha
2017-12-14 21:58 Anusha Srivatsa
2017-12-14 22:17 ` Michal Wajdeczko
2017-12-14 22:30 ` Srivatsa, Anusha
2017-12-15 6:07 ` Michal Wajdeczko
2017-12-15 23:02 ` Rodrigo Vivi
2017-12-18 19:25 ` Srivatsa, Anusha
2017-12-18 20:56 ` Michal Wajdeczko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.