* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-07-25 14:27 Michal Wajdeczko
2019-07-25 15:01 ` Daniele Ceraolo Spurio
2019-07-25 16:59 ` ✗ Fi.CI.BAT: failure for drm/i915/guc: Define GuC firmware version for Comet Lake (rev5) Patchwork
0 siblings, 2 replies; 11+ messages in thread
From: Michal Wajdeczko @ 2019-07-25 14:27 UTC (permalink / raw)
To: intel-gfx
From GT perspective, Comet Lake is just Coffe Lake rev 5,
but there is dedicated GuC firmware for it.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 789b3d7228a4..3519418b17ce 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -35,6 +35,7 @@
*/
#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
+ fw_def(COFFEELAKE, 5, guc_def(cml, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \
fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
--
2.19.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-07-25 14:27 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Michal Wajdeczko
@ 2019-07-25 15:01 ` Daniele Ceraolo Spurio
2019-07-25 16:59 ` ✗ Fi.CI.BAT: failure for drm/i915/guc: Define GuC firmware version for Comet Lake (rev5) Patchwork
1 sibling, 0 replies; 11+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-25 15:01 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx
On 7/25/19 7:27 AM, Michal Wajdeczko wrote:
> From GT perspective, Comet Lake is just Coffe Lake rev 5,
> but there is dedicated GuC firmware for it.
According to Anusha there is also a dedicated HuC FW for it, which
should be coming out soon, so we should probably wait and add them both
at the same time since we still don't have a use for GuC by itself
(because submission is still off).
Daniele
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 789b3d7228a4..3519418b17ce 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -35,6 +35,7 @@
> */
> #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
> fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
> + fw_def(COFFEELAKE, 5, guc_def(cml, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
> fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
> fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \
> fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915/guc: Define GuC firmware version for Comet Lake (rev5)
2019-07-25 14:27 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Michal Wajdeczko
2019-07-25 15:01 ` Daniele Ceraolo Spurio
@ 2019-07-25 16:59 ` Patchwork
1 sibling, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-07-25 16:59 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/guc: Define GuC firmware version for Comet Lake (rev5)
URL : https://patchwork.freedesktop.org/series/62969/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6552 -> Patchwork_13752
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13752 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_13752, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13752:
### IGT changes ###
#### Possible regressions ####
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
Known issues
------------
Here are the changes found in Patchwork_13752 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@bad-close:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-icl-u3/igt@gem_basic@bad-close.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-icl-u3/igt@gem_basic@bad-close.html
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][5] -> [INCOMPLETE][6] ([fdo#107718])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
* igt@i915_pm_rpm@module-reload:
- fi-icl-dsi: [PASS][7] -> [INCOMPLETE][8] ([fdo#107713] / [fdo#108840])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-icl-dsi/igt@i915_pm_rpm@module-reload.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-icl-dsi/igt@i915_pm_rpm@module-reload.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [PASS][9] -> [FAIL][10] ([fdo#103167])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
#### Possible fixes ####
* igt@gem_exec_reloc@basic-write-gtt:
- fi-icl-u3: [DMESG-WARN][11] ([fdo#107724]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-icl-u3/igt@gem_exec_reloc@basic-write-gtt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-icl-u3/igt@gem_exec_reloc@basic-write-gtt.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [WARN][13] ([fdo#109380]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-kbl-7567u/igt@kms_chamelium@common-hpd-after-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-kbl-7567u/igt@kms_chamelium@common-hpd-after-suspend.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][15] ([fdo#109485]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [SKIP][17] ([fdo#109271]) -> [PASS][18] +23 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6552/fi-kbl-7567u/igt@kms_pipe_crc_basic@read-crc-pipe-c.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/fi-kbl-7567u/igt@kms_pipe_crc_basic@read-crc-pipe-c.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
Participating hosts (55 -> 46)
------------------------------
Additional (1): fi-pnv-d510
Missing (10): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-y fi-icl-guc fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6552 -> Patchwork_13752
CI-20190529: 20190529
CI_DRM_6552: f9b5c6777cb0082fb7461ea8a57206b8de2d70dd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5112: 7e4d10507088055413769a020dd674f52b4bc1b0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13752: eed4e8521d10aba4ccc049195618c6c3b07bbd87 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
eed4e8521d10 drm/i915/guc: Define GuC firmware version for Comet Lake
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13752/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-07-15 23:24 Anusha Srivatsa
0 siblings, 0 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-07-15 23:24 UTC (permalink / raw)
To: intel-gfx
Load GuC for Comet Lake. Depending on the REVID,
we load either the KBL firmware or the CML firmware.
v2: Use CFL for CML platform check.(Michal)
v3: Use >=5 for future proofing(Michal, Daniele)
v4: rebased.
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
index 3dfa40fdbe99..c30cca292ec6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
@@ -52,6 +52,13 @@ MODULE_FIRMWARE(SKL_GUC_FIRMWARE_PATH);
#define BXT_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(BXT)
MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
+#define CML_GUC_FW_PREFIX cml
+#define CML_GUC_FW_MAJOR 33
+#define CML_GUC_FW_MINOR 0
+#define CML_GUC_FW_PATCH 0
+#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(CML)
+MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
+
#define KBL_GUC_FW_PREFIX kbl
#define KBL_GUC_FW_MAJOR 33
#define KBL_GUC_FW_MINOR 0
@@ -99,7 +106,17 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
guc_fw->path = GLK_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
- } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
+ } else if (IS_COFFEELAKE(i915)) {
+ if (INTEL_REVID(i915) >= 5) {
+ guc_fw->path = CML_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
+ } else {
+ guc_fw->path = KBL_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
+ }
+ } else if (IS_KABYLAKE(i915)) {
guc_fw->path = KBL_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-07-10 22:43 Anusha Srivatsa
0 siblings, 0 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-07-10 22:43 UTC (permalink / raw)
To: intel-gfx
Load GuC for Comet Lake. Depending on the REVID,
we load either the KBL firmware or the CML firmware.
v2: Use CFL for CML platform check.(Michal)
v3: Use >=5 for future proofing(Michal, Daniele)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_fw.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index db1e0daca7db..c8c94df1e5d0 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
#define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
+#define CML_GUC_FW_PREFIX cml
+#define CML_GUC_FW_MAJOR 33
+#define CML_GUC_FW_MINOR 0
+#define CML_GUC_FW_PATCH 0
+#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(CML)
+MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
+
#define GLK_GUC_FW_PREFIX glk
#define GLK_GUC_FW_MAJOR 33
#define GLK_GUC_FW_MINOR 0
@@ -94,7 +101,17 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
guc_fw->path = GLK_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
- } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
+ } else if (IS_COFFEELAKE(i915)) {
+ if (INTEL_REVID(i915) >= 5) {
+ guc_fw->path = CML_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
+ } else {
+ guc_fw->path = KBL_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
+ }
+ } else if (IS_KABYLAKE(i915)) {
guc_fw->path = KBL_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-07-08 21:08 Anusha Srivatsa
2019-07-10 1:08 ` Daniele Ceraolo Spurio
0 siblings, 1 reply; 11+ messages in thread
From: Anusha Srivatsa @ 2019-07-08 21:08 UTC (permalink / raw)
To: intel-gfx
Load GuC for Comet Lake. Depending on the REVID,
we load either the KBL firmware or the CML firmware.
v2: Use CFL for CML platform check.(Michal)
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_fw.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index db1e0daca7db..df0dfa49fbc8 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
#define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
+#define CML_GUC_FW_PREFIX cml
+#define CML_GUC_FW_MAJOR 33
+#define CML_GUC_FW_MINOR 0
+#define CML_GUC_FW_PATCH 0
+#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
+MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
+
#define GLK_GUC_FW_PREFIX glk
#define GLK_GUC_FW_MAJOR 33
#define GLK_GUC_FW_MINOR 0
@@ -94,7 +101,17 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
guc_fw->path = GLK_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
- } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
+ } else if (IS_COFFEELAKE(i915)) {
+ if (INTEL_REVID(i915) == 5) {
+ guc_fw->path = CML_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
+ } else {
+ guc_fw->path = KBL_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
+ }
+ } else if (IS_KABYLAKE(i915)) {
guc_fw->path = KBL_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-07-08 21:08 Anusha Srivatsa
@ 2019-07-10 1:08 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 11+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-10 1:08 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx
On 7/8/19 2:08 PM, Anusha Srivatsa wrote:
> Load GuC for Comet Lake. Depending on the REVID,
> we load either the KBL firmware or the CML firmware.
>
> v2: Use CFL for CML platform check.(Michal)
>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_fw.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index db1e0daca7db..df0dfa49fbc8 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
> #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
> MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
>
> +#define CML_GUC_FW_PREFIX cml
> +#define CML_GUC_FW_MAJOR 33
> +#define CML_GUC_FW_MINOR 0
> +#define CML_GUC_FW_PATCH 0
> +#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
s/KBL/CML
> +MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
> +
> #define GLK_GUC_FW_PREFIX glk
> #define GLK_GUC_FW_MAJOR 33
> #define GLK_GUC_FW_MINOR 0
> @@ -94,7 +101,17 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
> guc_fw->path = GLK_GUC_FIRMWARE_PATH;
> guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
> guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
> - } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
> + } else if (IS_COFFEELAKE(i915)) {
> + if (INTEL_REVID(i915) == 5) {
As Michal already commented on the previous rev, this should be >= 5 for
future-proofing.
Daniele
> + guc_fw->path = CML_GUC_FIRMWARE_PATH;
> + guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
> + guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
> + } else {
> + guc_fw->path = KBL_GUC_FIRMWARE_PATH;
> + guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
> + guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
> + }
> + } else if (IS_KABYLAKE(i915)) {
> guc_fw->path = KBL_GUC_FIRMWARE_PATH;
> guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
> guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-06-29 0:37 Anusha Srivatsa
2019-06-29 4:04 ` kbuild test robot
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-06-29 0:37 UTC (permalink / raw)
To: intel-gfx
Load GuC for Comet Lake. Depending on the REVID,
we load either the KBL firmware or the CML firmware.
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_fw.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index 970f39ef248b..eb0be87c358f 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
#define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
+#define CML_GUC_FW_PREFIX cml
+#define CML_GUC_FW_MAJOR 33
+#define CML_GUC_FW_MINOR 0
+#define CML_GUC_FW_PATCH 0
+#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
+MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
+
#define GLK_GUC_FW_PREFIX glk
#define GLK_GUC_FW_MAJOR 32
#define GLK_GUC_FW_MINOR 0
@@ -94,6 +101,16 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
guc_fw->path = GLK_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
+ } else if (IS_COMETLAKE(i915)) {
+ if (REVID(dev_priv) == 5) {
+ guc_fw->path = CML_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
+ } else {
+ guc_fw->path = KBL_GUC_FIRMWARE_PATH;
+ guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
+ guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
+ }
} else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
guc_fw->path = KBL_GUC_FIRMWARE_PATH;
guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 Anusha Srivatsa
@ 2019-06-29 4:04 ` kbuild test robot
2019-06-29 4:52 ` kbuild test robot
2019-07-01 12:21 ` Michal Wajdeczko
2 siblings, 0 replies; 11+ messages in thread
From: kbuild test robot @ 2019-06-29 4:04 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3940 bytes --]
Hi Anusha,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20190625]
[cannot apply to v5.2-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/drm-i915-guc-Define-GuC-firmware-version-for-Comet-Lake/20190629-110106
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-allyesconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-9) 7.4.0
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/gpu//drm/i915/intel_guc_fw.c: In function 'guc_fw_select':
>> drivers/gpu//drm/i915/intel_guc_fw.c:104:13: error: implicit declaration of function 'IS_COMETLAKE'; did you mean 'IS_COFFEELAKE'? [-Werror=implicit-function-declaration]
} else if (IS_COMETLAKE(i915)) {
^~~~~~~~~~~~
IS_COFFEELAKE
>> drivers/gpu//drm/i915/intel_guc_fw.c:105:7: error: implicit declaration of function 'REVID'; did you mean 'READ'? [-Werror=implicit-function-declaration]
if (REVID(dev_priv) == 5) {
^~~~~
READ
>> drivers/gpu//drm/i915/intel_guc_fw.c:105:13: error: 'dev_priv' undeclared (first use in this function); did you mean 'dev_crit'?
if (REVID(dev_priv) == 5) {
^~~~~~~~
dev_crit
drivers/gpu//drm/i915/intel_guc_fw.c:105:13: note: each undeclared identifier is reported only once for each function it appears in
cc1: some warnings being treated as errors
vim +104 drivers/gpu//drm/i915/intel_guc_fw.c
81
82 static void guc_fw_select(struct intel_uc_fw *guc_fw)
83 {
84 struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
85 struct drm_i915_private *i915 = guc_to_i915(guc);
86
87 GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);
88
89 if (!HAS_GUC(i915))
90 return;
91
92 if (i915_modparams.guc_firmware_path) {
93 guc_fw->path = i915_modparams.guc_firmware_path;
94 guc_fw->major_ver_wanted = 0;
95 guc_fw->minor_ver_wanted = 0;
96 } else if (IS_ICELAKE(i915)) {
97 guc_fw->path = ICL_GUC_FIRMWARE_PATH;
98 guc_fw->major_ver_wanted = ICL_GUC_FW_MAJOR;
99 guc_fw->minor_ver_wanted = ICL_GUC_FW_MINOR;
100 } else if (IS_GEMINILAKE(i915)) {
101 guc_fw->path = GLK_GUC_FIRMWARE_PATH;
102 guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
103 guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
> 104 } else if (IS_COMETLAKE(i915)) {
> 105 if (REVID(dev_priv) == 5) {
106 guc_fw->path = CML_GUC_FIRMWARE_PATH;
107 guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
108 guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
109 } else {
110 guc_fw->path = KBL_GUC_FIRMWARE_PATH;
111 guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
112 guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
113 }
114 } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
115 guc_fw->path = KBL_GUC_FIRMWARE_PATH;
116 guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
117 guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
118 } else if (IS_BROXTON(i915)) {
119 guc_fw->path = BXT_GUC_FIRMWARE_PATH;
120 guc_fw->major_ver_wanted = BXT_GUC_FW_MAJOR;
121 guc_fw->minor_ver_wanted = BXT_GUC_FW_MINOR;
122 } else if (IS_SKYLAKE(i915)) {
123 guc_fw->path = SKL_GUC_FIRMWARE_PATH;
124 guc_fw->major_ver_wanted = SKL_GUC_FW_MAJOR;
125 guc_fw->minor_ver_wanted = SKL_GUC_FW_MINOR;
126 }
127 }
128
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 68949 bytes --]
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 Anusha Srivatsa
2019-06-29 4:04 ` kbuild test robot
@ 2019-06-29 4:52 ` kbuild test robot
2019-07-01 12:21 ` Michal Wajdeczko
2 siblings, 0 replies; 11+ messages in thread
From: kbuild test robot @ 2019-06-29 4:52 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 7675 bytes --]
Hi Anusha,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20190625]
[cannot apply to v5.2-rc6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Anusha-Srivatsa/drm-i915-guc-Define-GuC-firmware-version-for-Comet-Lake/20190629-110106
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x004-201925 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
In file included from include/asm-generic/bug.h:5:0,
from arch/x86/include/asm/bug.h:83,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from include/linux/io-mapping.h:22,
from drivers/gpu/drm/i915/i915_drv.h:36,
from drivers/gpu/drm/i915/intel_guc_fw.c:31:
drivers/gpu/drm/i915/intel_guc_fw.c: In function 'guc_fw_select':
drivers/gpu/drm/i915/intel_guc_fw.c:104:13: error: implicit declaration of function 'IS_COMETLAKE'; did you mean 'IS_COFFEELAKE'? [-Werror=implicit-function-declaration]
} else if (IS_COMETLAKE(i915)) {
^
include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var'
#define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
^~~~
>> drivers/gpu/drm/i915/intel_guc_fw.c:104:9: note: in expansion of macro 'if'
} else if (IS_COMETLAKE(i915)) {
^~
drivers/gpu/drm/i915/intel_guc_fw.c:105:7: error: implicit declaration of function 'REVID'; did you mean 'READ'? [-Werror=implicit-function-declaration]
if (REVID(dev_priv) == 5) {
^
include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var'
#define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
^~~~
drivers/gpu/drm/i915/intel_guc_fw.c:105:3: note: in expansion of macro 'if'
if (REVID(dev_priv) == 5) {
^~
drivers/gpu/drm/i915/intel_guc_fw.c:105:13: error: 'dev_priv' undeclared (first use in this function); did you mean 'dev_crit'?
if (REVID(dev_priv) == 5) {
^
include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var'
#define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
^~~~
drivers/gpu/drm/i915/intel_guc_fw.c:105:3: note: in expansion of macro 'if'
if (REVID(dev_priv) == 5) {
^~
drivers/gpu/drm/i915/intel_guc_fw.c:105:13: note: each undeclared identifier is reported only once for each function it appears in
if (REVID(dev_priv) == 5) {
^
include/linux/compiler.h:58:52: note: in definition of macro '__trace_if_var'
#define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond))
^~~~
drivers/gpu/drm/i915/intel_guc_fw.c:105:3: note: in expansion of macro 'if'
if (REVID(dev_priv) == 5) {
^~
cc1: some warnings being treated as errors
vim +/if +104 drivers/gpu/drm/i915/intel_guc_fw.c
> 31 #include "i915_drv.h"
32
33 #define __MAKE_GUC_FW_PATH(KEY) \
34 "i915/" \
35 __stringify(KEY##_GUC_FW_PREFIX) "_guc_" \
36 __stringify(KEY##_GUC_FW_MAJOR) "." \
37 __stringify(KEY##_GUC_FW_MINOR) "." \
38 __stringify(KEY##_GUC_FW_PATCH) ".bin"
39
40 #define SKL_GUC_FW_PREFIX skl
41 #define SKL_GUC_FW_MAJOR 32
42 #define SKL_GUC_FW_MINOR 0
43 #define SKL_GUC_FW_PATCH 3
44 #define SKL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(SKL)
45 MODULE_FIRMWARE(SKL_GUC_FIRMWARE_PATH);
46
47 #define BXT_GUC_FW_PREFIX bxt
48 #define BXT_GUC_FW_MAJOR 32
49 #define BXT_GUC_FW_MINOR 0
50 #define BXT_GUC_FW_PATCH 3
51 #define BXT_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(BXT)
52 MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
53
54 #define KBL_GUC_FW_PREFIX kbl
55 #define KBL_GUC_FW_MAJOR 32
56 #define KBL_GUC_FW_MINOR 0
57 #define KBL_GUC_FW_PATCH 3
58 #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
59 MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
60
61 #define CML_GUC_FW_PREFIX cml
62 #define CML_GUC_FW_MAJOR 33
63 #define CML_GUC_FW_MINOR 0
64 #define CML_GUC_FW_PATCH 0
65 #define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
66 MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
67
68 #define GLK_GUC_FW_PREFIX glk
69 #define GLK_GUC_FW_MAJOR 32
70 #define GLK_GUC_FW_MINOR 0
71 #define GLK_GUC_FW_PATCH 3
72 #define GLK_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(GLK)
73 MODULE_FIRMWARE(GLK_GUC_FIRMWARE_PATH);
74
75 #define ICL_GUC_FW_PREFIX icl
76 #define ICL_GUC_FW_MAJOR 32
77 #define ICL_GUC_FW_MINOR 0
78 #define ICL_GUC_FW_PATCH 3
79 #define ICL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(ICL)
80 MODULE_FIRMWARE(ICL_GUC_FIRMWARE_PATH);
81
82 static void guc_fw_select(struct intel_uc_fw *guc_fw)
83 {
84 struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
85 struct drm_i915_private *i915 = guc_to_i915(guc);
86
87 GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);
88
89 if (!HAS_GUC(i915))
90 return;
91
92 if (i915_modparams.guc_firmware_path) {
93 guc_fw->path = i915_modparams.guc_firmware_path;
94 guc_fw->major_ver_wanted = 0;
95 guc_fw->minor_ver_wanted = 0;
96 } else if (IS_ICELAKE(i915)) {
97 guc_fw->path = ICL_GUC_FIRMWARE_PATH;
98 guc_fw->major_ver_wanted = ICL_GUC_FW_MAJOR;
99 guc_fw->minor_ver_wanted = ICL_GUC_FW_MINOR;
100 } else if (IS_GEMINILAKE(i915)) {
101 guc_fw->path = GLK_GUC_FIRMWARE_PATH;
102 guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
103 guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
> 104 } else if (IS_COMETLAKE(i915)) {
105 if (REVID(dev_priv) == 5) {
106 guc_fw->path = CML_GUC_FIRMWARE_PATH;
107 guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
108 guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
109 } else {
110 guc_fw->path = KBL_GUC_FIRMWARE_PATH;
111 guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
112 guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
113 }
114 } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
115 guc_fw->path = KBL_GUC_FIRMWARE_PATH;
116 guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
117 guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
118 } else if (IS_BROXTON(i915)) {
119 guc_fw->path = BXT_GUC_FIRMWARE_PATH;
120 guc_fw->major_ver_wanted = BXT_GUC_FW_MAJOR;
121 guc_fw->minor_ver_wanted = BXT_GUC_FW_MINOR;
122 } else if (IS_SKYLAKE(i915)) {
123 guc_fw->path = SKL_GUC_FIRMWARE_PATH;
124 guc_fw->major_ver_wanted = SKL_GUC_FW_MAJOR;
125 guc_fw->minor_ver_wanted = SKL_GUC_FW_MINOR;
126 }
127 }
128
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 30185 bytes --]
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 Anusha Srivatsa
2019-06-29 4:04 ` kbuild test robot
2019-06-29 4:52 ` kbuild test robot
@ 2019-07-01 12:21 ` Michal Wajdeczko
2 siblings, 0 replies; 11+ messages in thread
From: Michal Wajdeczko @ 2019-07-01 12:21 UTC (permalink / raw)
To: intel-gfx, Anusha Srivatsa
On Sat, 29 Jun 2019 02:37:09 +0200, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Load GuC for Comet Lake. Depending on the REVID,
> we load either the KBL firmware or the CML firmware.
>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_fw.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c
> b/drivers/gpu/drm/i915/intel_guc_fw.c
> index 970f39ef248b..eb0be87c358f 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -58,6 +58,13 @@ MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH);
> #define KBL_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
> MODULE_FIRMWARE(KBL_GUC_FIRMWARE_PATH);
> +#define CML_GUC_FW_PREFIX cml
> +#define CML_GUC_FW_MAJOR 33
> +#define CML_GUC_FW_MINOR 0
> +#define CML_GUC_FW_PATCH 0
you can't add GuC firmware with different major version then currently
supported by the driver as it will not work. please note that series for
enabling GuC 33.0.0 is still not merged, see latest drop on trybot [1]
[1] https://patchwork.freedesktop.org/series/62774/
> +#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(KBL)
> +MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH);
> +
> #define GLK_GUC_FW_PREFIX glk
> #define GLK_GUC_FW_MAJOR 32
> #define GLK_GUC_FW_MINOR 0
> @@ -94,6 +101,16 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
> guc_fw->path = GLK_GUC_FIRMWARE_PATH;
> guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR;
> guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR;
> + } else if (IS_COMETLAKE(i915)) {
we treat CML as COFFEELAKE
> + if (REVID(dev_priv) == 5) {
maybe to be future proof, this should be >= 5 ?
> + guc_fw->path = CML_GUC_FIRMWARE_PATH;
> + guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR;
> + guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR;
> + } else {
> + guc_fw->path = KBL_GUC_FIRMWARE_PATH;
> + guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
> + guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;
> + }
> } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) {
please remove CFL from here
> guc_fw->path = KBL_GUC_FIRMWARE_PATH;
> guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-07-25 16:59 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-25 14:27 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Michal Wajdeczko
2019-07-25 15:01 ` Daniele Ceraolo Spurio
2019-07-25 16:59 ` ✗ Fi.CI.BAT: failure for drm/i915/guc: Define GuC firmware version for Comet Lake (rev5) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-07-15 23:24 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
2019-07-10 22:43 Anusha Srivatsa
2019-07-08 21:08 Anusha Srivatsa
2019-07-10 1:08 ` Daniele Ceraolo Spurio
2019-06-29 0:37 Anusha Srivatsa
2019-06-29 4:04 ` kbuild test robot
2019-06-29 4:52 ` kbuild test robot
2019-07-01 12:21 ` Michal Wajdeczko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox