diff mbox

i915/guc: Add Kabylake GuC Loading

Message ID 1453128099-27596-1-git-send-email-peter.antoine@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Antoine Jan. 18, 2016, 2:41 p.m. UTC 
This patch added the loading of the GuC for Kabylake.
It loads a 2.4 firmware.

Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

yu.dai@intel.com Jan. 19, 2016, 6:17 p.m. UTC | #1 
I am OK with change here. However, in i915_drv.h, please check 
definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are 
disabled for KBL.

Thanks,
Alex

On 01/18/2016 06:41 AM, Peter Antoine wrote:
> This patch added the loading of the GuC for Kabylake.
> It loads a 2.4 firmware.
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 3accd91..bbfa8f3 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -61,6 +61,8 @@
>   
>   #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
>   MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
> +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin"
> +MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
>   
>   /* User-friendly representation of an enum */
>   const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
> @@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
>   		fw_path = I915_SKL_GUC_UCODE;
>   		guc_fw->guc_fw_major_wanted = 4;
>   		guc_fw->guc_fw_minor_wanted = 3;
> +	} else if (IS_KABYLAKE(dev)) {
> +		fw_path = I915_KBL_GUC_UCODE;
> +		guc_fw->guc_fw_major_wanted = 2;
> +		guc_fw->guc_fw_minor_wanted = 4;
>   	} else {
>   		i915.enable_guc_submission = false;
>   		fw_path = "";	/* unknown device */
Peter Antoine Jan. 19, 2016, 9:19 p.m. UTC | #2 
Yup, I missed a patch.
Just sent a new sequence.

Peter.

-----Original Message-----
From: Dai, Yu 
Sent: Tuesday, January 19, 2016 6:18 PM
To: Antoine, Peter; intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel
Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading

I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL.

Thanks,
Alex

On 01/18/2016 06:41 AM, Peter Antoine wrote:
> This patch added the loading of the GuC for Kabylake.
> It loads a 2.4 firmware.
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c 
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 3accd91..bbfa8f3 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -61,6 +61,8 @@
>   
>   #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
>   MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
> +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin"
> +MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
>   
>   /* User-friendly representation of an enum */
>   const char *intel_guc_fw_status_repr(enum intel_guc_fw_status 
> status) @@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
>   		fw_path = I915_SKL_GUC_UCODE;
>   		guc_fw->guc_fw_major_wanted = 4;
>   		guc_fw->guc_fw_minor_wanted = 3;
> +	} else if (IS_KABYLAKE(dev)) {
> +		fw_path = I915_KBL_GUC_UCODE;
> +		guc_fw->guc_fw_major_wanted = 2;
> +		guc_fw->guc_fw_minor_wanted = 4;
>   	} else {
>   		i915.enable_guc_submission = false;
>   		fw_path = "";	/* unknown device */
Peter Antoine Jan. 19, 2016, 9:51 p.m. UTC | #3 
Please look at v2, had to change the order of the patches.

-----Original Message-----
From: Antoine, Peter 
Sent: Tuesday, January 19, 2016 9:20 PM
To: Dai, Yu; intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel
Subject: RE: [PATCH] i915/guc: Add Kabylake GuC Loading

Yup, I missed a patch.
Just sent a new sequence.

Peter.

-----Original Message-----
From: Dai, Yu 
Sent: Tuesday, January 19, 2016 6:18 PM
To: Antoine, Peter; intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel
Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading

I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL.

Thanks,
Alex

On 01/18/2016 06:41 AM, Peter Antoine wrote:
> This patch added the loading of the GuC for Kabylake.
> It loads a 2.4 firmware.
>
> Signed-off-by: Peter Antoine <peter.antoine@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c 
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 3accd91..bbfa8f3 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -61,6 +61,8 @@
>   
>   #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
>   MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
> +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin"
> +MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
>   
>   /* User-friendly representation of an enum */
>   const char *intel_guc_fw_status_repr(enum intel_guc_fw_status 
> status) @@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
>   		fw_path = I915_SKL_GUC_UCODE;
>   		guc_fw->guc_fw_major_wanted = 4;
>   		guc_fw->guc_fw_minor_wanted = 3;
> +	} else if (IS_KABYLAKE(dev)) {
> +		fw_path = I915_KBL_GUC_UCODE;
> +		guc_fw->guc_fw_major_wanted = 2;
> +		guc_fw->guc_fw_minor_wanted = 4;
>   	} else {
>   		i915.enable_guc_submission = false;
>   		fw_path = "";	/* unknown device */
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 3accd91..bbfa8f3 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -61,6 +61,8 @@ 
 
 #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
+#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin"
+MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
@@ -597,6 +599,10 @@  void intel_guc_ucode_init(struct drm_device *dev)
 		fw_path = I915_SKL_GUC_UCODE;
 		guc_fw->guc_fw_major_wanted = 4;
 		guc_fw->guc_fw_minor_wanted = 3;
+	} else if (IS_KABYLAKE(dev)) {
+		fw_path = I915_KBL_GUC_UCODE;
+		guc_fw->guc_fw_major_wanted = 2;
+		guc_fw->guc_fw_minor_wanted = 4;
 	} else {
 		i915.enable_guc_submission = false;
 		fw_path = "";	/* unknown device */