* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
[not found] <1490130577-3679-1-git-send-email-anusha.srivatsa@intel.com>
@ 2017-03-28 21:35 ` John Spotswood
2017-03-28 22:11 ` Srivatsa, Anusha
0 siblings, 1 reply; 8+ messages in thread
From: John Spotswood @ 2017-03-28 21:35 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi
On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
> Load GuC 10.56 on GLK. Work on firmware is still
> in progress. Testing has not been done yet.
> This patch addresses the initial need to load the GuC
> firmware for HuC authentication
>
> Cc: Jeff mcgee <jeff.mcgee@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 2f270d0..a6899df 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -61,6 +61,9 @@
> #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"
>
> @@ -73,6 +76,8 @@ 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)
You need a line after this #define that says the following:
MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
> +
> /* User-friendly representation of an enum */
> const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
> {
> @@ -423,6 +428,10 @@ 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;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
2017-03-28 21:35 ` [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK John Spotswood
@ 2017-03-28 22:11 ` Srivatsa, Anusha
2017-03-29 0:01 ` Vivi, Rodrigo
0 siblings, 1 reply; 8+ messages in thread
From: Srivatsa, Anusha @ 2017-03-28 22:11 UTC (permalink / raw)
To: Spotswood, John A, intel-gfx@lists.freedesktop.org; +Cc: Vivi, Rodrigo
>-----Original Message-----
>From: Spotswood, John A
>Sent: Tuesday, March 28, 2017 2:35 PM
>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
>gfx@lists.freedesktop.org
>Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
>Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
>
>On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
>> Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing
>> has not been done yet.
>> This patch addresses the initial need to load the GuC firmware for HuC
>> authentication
>>
>> Cc: Jeff mcgee <jeff.mcgee@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: John Spotswood <john.a.spotswood@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
>> b/drivers/gpu/drm/i915/intel_guc_loader.c
>> index 2f270d0..a6899df 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -61,6 +61,9 @@
>> #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"
>>
>> @@ -73,6 +76,8 @@ 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)
>
>You need a line after this #define that says the following:
> MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet, it is unnecessary noise.
Anusha
>> +
>> /* User-friendly representation of an enum */
>> const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
>> {
>> @@ -423,6 +428,10 @@ 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;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
2017-03-28 22:11 ` Srivatsa, Anusha
@ 2017-03-29 0:01 ` Vivi, Rodrigo
2017-03-29 0:32 ` John Spotswood
2017-03-30 13:52 ` Joonas Lahtinen
0 siblings, 2 replies; 8+ messages in thread
From: Vivi, Rodrigo @ 2017-03-29 0:01 UTC (permalink / raw)
To: Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org
On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
>
> >-----Original Message-----
> >From: Spotswood, John A
> >Sent: Tuesday, March 28, 2017 2:35 PM
> >To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> >gfx@lists.freedesktop.org
> >Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
> >Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
> >
> >On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
> >> Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing
> >> has not been done yet.
> >> This patch addresses the initial need to load the GuC firmware for HuC
> >> authentication
> >>
> >> Cc: Jeff mcgee <jeff.mcgee@intel.com>
> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> Cc: John Spotswood <john.a.spotswood@intel.com>
> >> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> >> ---
> >> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
> >> 1 file changed, 9 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> >> b/drivers/gpu/drm/i915/intel_guc_loader.c
> >> index 2f270d0..a6899df 100644
> >> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> >> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> >> @@ -61,6 +61,9 @@
> >> #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"
> >>
> >> @@ -73,6 +76,8 @@ 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)
> >
> >You need a line after this #define that says the following:
> > MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
>
>
> Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet, it is unnecessary noise.
+MODULE_FIRMARE() should be in a separated patch and only get merged
after the firmware got released at 01.org propagated and merged to
linux-firmware.git.
>
>
> Anusha
> >> +
> >> /* User-friendly representation of an enum */
> >> const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
> >> {
> >> @@ -423,6 +428,10 @@ 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;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
2017-03-29 0:01 ` Vivi, Rodrigo
@ 2017-03-29 0:32 ` John Spotswood
2017-03-30 13:52 ` Joonas Lahtinen
1 sibling, 0 replies; 8+ messages in thread
From: John Spotswood @ 2017-03-29 0:32 UTC (permalink / raw)
To: Vivi, Rodrigo, Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org
On Tue, 2017-03-28 at 17:01 -0700, Vivi, Rodrigo wrote:
> On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
> >
> >
> > >
> > > -----Original Message-----
> > > From: Spotswood, John A
> > > Sent: Tuesday, March 28, 2017 2:35 PM
> > > To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> > > gfx@lists.freedesktop.org
> > > Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vi
> > > vi@intel.com>
> > > Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
> > >
> > >
> > > > @@ -73,6 +76,8 @@ 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)
> > > You need a line after this #define that says the following:
> > > MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
> >
> >
> > Hi John, we have decided to not use it in pre-production platforms.
> > Using MODULE_FIRMWARE is going to shout that the firmware is not
> > available in systems. Since we will not be releasing the firmware
> > binary to the public yet, it is unnecessary noise.
> +MODULE_FIRMARE() should be in a separated patch and only get merged
> after the firmware got released at 01.org propagated and merged to
> linux-firmware.git.
>
Makes sense. My mistake.
John
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
2017-03-29 0:01 ` Vivi, Rodrigo
2017-03-29 0:32 ` John Spotswood
@ 2017-03-30 13:52 ` Joonas Lahtinen
1 sibling, 0 replies; 8+ messages in thread
From: Joonas Lahtinen @ 2017-03-30 13:52 UTC (permalink / raw)
To: Vivi, Rodrigo, Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org
On ke, 2017-03-29 at 00:01 +0000, Vivi, Rodrigo wrote:
> On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
> > > > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> > > > @@ -61,6 +61,9 @@
> > > > #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"
> > > >
> > > > @@ -73,6 +76,8 @@ 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)
> > >
> > > You need a line after this #define that says the following:
> > > MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
> >
> > Hi John, we have decided to not use it in pre-production platforms.
> > Using MODULE_FIRMWARE is going to shout that the firmware is not
> > available in systems. Since we will not be releasing the firmware
> > binary to the public yet, it is unnecessary noise.
>
> +MODULE_FIRMARE() should be in a separated patch and only get merged
> after the firmware got released at 01.org propagated and merged to
> linux-firmware.git.
Would it make a sense to put a big comment in the code at this spot?
Pretty much what you wrote down.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
@ 2017-03-30 20:24 Anusha Srivatsa
2017-03-30 23:31 ` John Spotswood
0 siblings, 1 reply; 8+ messages in thread
From: Anusha Srivatsa @ 2017-03-30 20:24 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Load GuC 10.56 on GLK. Work on firmware is still
in progress. Testing has not been done yet.
This patch addresses the initial need to load the GuC
firmware for HuC authentication
v2: rebased.
Cc: Jeff mcgee <jeff.mcgee@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 7d92321..1f8edf0 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,6 +61,9 @@
#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"
@@ -73,6 +76,8 @@ 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)
+
/* User-friendly representation of an enum */
const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
{
@@ -421,6 +426,10 @@ 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;
--
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] 8+ messages in thread* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
2017-03-30 20:24 Anusha Srivatsa
@ 2017-03-30 23:31 ` John Spotswood
0 siblings, 0 replies; 8+ messages in thread
From: John Spotswood @ 2017-03-30 23:31 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi
On Thu, 2017-03-30 at 13:24 -0700, Anusha Srivatsa wrote:
> Load GuC 10.56 on GLK. Work on firmware is still
> in progress. Testing has not been done yet.
> This patch addresses the initial need to load the GuC
> firmware for HuC authentication
>
> v2: rebased.
>
> Cc: Jeff mcgee <jeff.mcgee@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: John Spotswood <john.a.spotswood@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 7d92321..1f8edf0 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -61,6 +61,9 @@
> #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"
>
> @@ -73,6 +76,8 @@ 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)
> +
> /* User-friendly representation of an enum */
> const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
> {
> @@ -421,6 +426,10 @@ 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;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
@ 2017-03-21 21:10 Anusha Srivatsa
0 siblings, 0 replies; 8+ messages in thread
From: Anusha Srivatsa @ 2017-03-21 21:10 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Load GuC 10.56 on GLK. Work on firmware is still
in progress. Testing has not been done yet.
This patch addresses the initial need to load the GuC
firmware for HuC authentication
Cc: Jeff mcgee <jeff.mcgee@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 2f270d0..a6899df 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,6 +61,9 @@
#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"
@@ -73,6 +76,8 @@ 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)
+
/* User-friendly representation of an enum */
const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
{
@@ -423,6 +428,10 @@ 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;
--
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] 8+ messages in thread
end of thread, other threads:[~2017-03-30 23:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1490130577-3679-1-git-send-email-anusha.srivatsa@intel.com>
2017-03-28 21:35 ` [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK John Spotswood
2017-03-28 22:11 ` Srivatsa, Anusha
2017-03-29 0:01 ` Vivi, Rodrigo
2017-03-29 0:32 ` John Spotswood
2017-03-30 13:52 ` Joonas Lahtinen
2017-03-30 20:24 Anusha Srivatsa
2017-03-30 23:31 ` John Spotswood
-- strict thread matches above, loose matches on Subject: below --
2017-03-21 21:10 Anusha Srivatsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).