* [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
@ 2019-06-29 0:37 Anusha Srivatsa
2019-06-29 1:03 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ 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] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
@ 2019-06-29 1:03 ` Patchwork
2019-06-29 4:04 ` [PATCH] " kbuild test robot
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-06-29 1:03 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/guc: Define GuC firmware version for Comet Lake
URL : https://patchwork.freedesktop.org/series/62969/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
AR drivers/gpu/drm/i915/built-in.a
CC [M] drivers/gpu/drm/i915/header_test_i915_active_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_debugfs.o
CC [M] drivers/gpu/drm/i915/header_test_i915_drv.o
CC [M] drivers/gpu/drm/i915/header_test_i915_fixed.o
CC [M] drivers/gpu/drm/i915/header_test_i915_gem_gtt.o
CC [M] drivers/gpu/drm/i915/header_test_i915_globals.o
CC [M] drivers/gpu/drm/i915/header_test_i915_irq.o
CC [M] drivers/gpu/drm/i915/header_test_i915_params.o
CC [M] drivers/gpu/drm/i915/header_test_i915_priolist_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_pvinfo.o
CC [M] drivers/gpu/drm/i915/header_test_i915_reg.o
CC [M] drivers/gpu/drm/i915/header_test_i915_scheduler_types.o
CC [M] drivers/gpu/drm/i915/header_test_i915_utils.o
CC [M] drivers/gpu/drm/i915/header_test_i915_vgpu.o
CC [M] drivers/gpu/drm/i915/header_test_intel_csr.o
CC [M] drivers/gpu/drm/i915/header_test_intel_drv.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_ct.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_fwif.o
CC [M] drivers/gpu/drm/i915/header_test_intel_guc_reg.o
CC [M] drivers/gpu/drm/i915/header_test_intel_gvt.o
CC [M] drivers/gpu/drm/i915/header_test_intel_pm.o
CC [M] drivers/gpu/drm/i915/header_test_intel_runtime_pm.o
CC [M] drivers/gpu/drm/i915/header_test_intel_sideband.o
CC [M] drivers/gpu/drm/i915/header_test_intel_uc_fw.o
CC [M] drivers/gpu/drm/i915/header_test_intel_uncore.o
CC [M] drivers/gpu/drm/i915/header_test_intel_wakeref.o
CC [M] drivers/gpu/drm/i915/intel_guc_fw.o
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: all warnings being treated as errors
scripts/Makefile.build:278: recipe for target 'drivers/gpu/drm/i915/intel_guc_fw.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_guc_fw.o] Error 1
scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1071: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
2019-06-29 1:03 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2019-06-29 4:04 ` kbuild test robot
2019-06-29 4:52 ` kbuild test robot
2019-07-01 12:21 ` Michal Wajdeczko
3 siblings, 0 replies; 5+ 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] 5+ messages in thread
* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
2019-06-29 1:03 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-06-29 4:04 ` [PATCH] " kbuild test robot
@ 2019-06-29 4:52 ` kbuild test robot
2019-07-01 12:21 ` Michal Wajdeczko
3 siblings, 0 replies; 5+ 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] 5+ messages in thread
* Re: [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake
2019-06-29 0:37 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
` (2 preceding siblings ...)
2019-06-29 4:52 ` kbuild test robot
@ 2019-07-01 12:21 ` Michal Wajdeczko
3 siblings, 0 replies; 5+ 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] 5+ messages in thread
end of thread, other threads:[~2019-07-01 12:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-29 0:37 [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake Anusha Srivatsa
2019-06-29 1:03 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-06-29 4:04 ` [PATCH] " 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