Skip to contentSkip to conversation

drm/i915: Include GuC fw version in error state

PATCH In review Michel Thierry 5 participants 13 messages Feb 23, 2017 – Feb 24, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Include GuC fw version in error state

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +10 -0
index 2b1d15668192..e022187916ee 100644
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 			   CSR_VERSION_MINOR(csr->version));
 	}
 
+	if (HAS_GUC_UCODE(dev_priv)) {
+		struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+		err_printf(m, "GuC loaded: %s\n",
+			   yesno(guc_fw->load_status ==
+				 INTEL_UC_FIRMWARE_SUCCESS));
+		err_printf(m, "GuC fw version: %d.%d\n",
+			   guc_fw->major_ver_found, guc_fw->minor_ver_found);
+	}
+
 	err_printf(m, "EIR: 0x%08x\n", error->eir);
 	err_printf(m, "IER: 0x%08x\n", error->ier);
 	for (i = 0; i < error->ngtier; i++)
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915: Include GuC fw version in error state

== Series Details ==

== Series Details ==

Series: drm/i915: Include GuC fw version in error state
URL : https://patchwork.freedesktop.org/series/20181/
State : success

== Summary ==

Series 20181v1 drm/i915: Include GuC fw version in error state
https://patchwork.freedesktop.org/api/1.0/series/20181/revisions/1/mbox/

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:108  pass:95   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29 

c6638f903295bbbd29957b878a42b83c5566250c drm-tip: 2017y-02m-23d-22h-50m-35s UTC integration manifest b721bdd drm/i915: Include GuC fw version in error state

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3956/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Michel Thierry
Quoted 20 lines · Michel Thierry

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
---
  drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +3 -0
index 2b1d15668192..e022187916ee 100644
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
  			   CSR_VERSION_MINOR(csr->version));
  	}
 
+	if (HAS_GUC_UCODE(dev_priv)) {
+		struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 647

Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +7 -0
+		err_printf(m, "GuC loaded: %s\n",
+			   yesno(guc_fw->load_status ==
+				 INTEL_UC_FIRMWARE_SUCCESS));
+		err_printf(m, "GuC fw version: %d.%d\n",
+			   guc_fw->major_ver_found, guc_fw->minor_ver_found);
+	}
+
  	err_printf(m, "EIR: 0x%08x\n", error->eir);
  	err_printf(m, "IER: 0x%08x\n", error->ier);
  	for (i = 0; i < error->ngtier; i++)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 21 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>

---

  drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
  1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2b1d15668192..e022187916ee 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,

                            CSR_VERSION_MINOR(csr->version));
         }
Quoted 10 lines

+ if (HAS_GUC_UCODE(dev_priv)) {
+ struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+ err_printf(m, "GuC loaded: %s\n",
+ yesno(guc_fw->load_status ==
+ INTEL_UC_FIRMWARE_SUCCESS));
+ err_printf(m, "GuC fw version: %d.%d\n",
+ guc_fw->major_ver_found, guc_fw->minor_ver_found);
+ }
+

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset). -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 33 lines · Chris Wilson
Quoted 21 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>

---

  drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
  1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2b1d15668192..e022187916ee 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,

                            CSR_VERSION_MINOR(csr->version));
         }
Quoted 10 lines

+ if (HAS_GUC_UCODE(dev_priv)) {
+ struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+ err_printf(m, "GuC loaded: %s\n",
+ yesno(guc_fw->load_status ==
+ INTEL_UC_FIRMWARE_SUCCESS));
+ err_printf(m, "GuC fw version: %d.%d\n",
+ guc_fw->major_ver_found, guc_fw->minor_ver_found);
+ }
+

Quoted 2 lines

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

-Michal

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 34 lines · Michal Wajdeczko
Quoted 33 lines · Chris Wilson
Quoted 31 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>

---

  drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
  1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2b1d15668192..e022187916ee 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,

                            CSR_VERSION_MINOR(csr->version));
         }

+ if (HAS_GUC_UCODE(dev_priv)) {
+ struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+ err_printf(m, "GuC loaded: %s\n",
+ yesno(guc_fw->load_status ==
+ INTEL_UC_FIRMWARE_SUCCESS));
+ err_printf(m, "GuC fw version: %d.%d\n",
+ guc_fw->major_ver_found, guc_fw->minor_ver_found);
+ }
+

Quoted 5 lines
Quoted 2 lines

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

If it occurs to you that we need it for post-mortem debugging and having it is worth more than any potential confusion....

I can see the need for knowing what guc/huc/dmc/etc was running at the time of a hang - I just hope that what was previously running before an earlier reset doesn't contribute. But that's why we focus on the first error in a system...
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 38 lines · Chris Wilson
Quoted 33 lines · Michal Wajdeczko
Quoted 32 lines · Chris Wilson
Quoted 31 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>

---

   drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
   1 file changed, 10 insertions(+)
  diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
  index 2b1d15668192..e022187916ee 100644
  --- a/drivers/gpu/drm/i915/i915_gpu_error.c
  +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
  @@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                             CSR_VERSION_MINOR(csr->version));
          }

+ if (HAS_GUC_UCODE(dev_priv)) {
+ struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+ err_printf(m, "GuC loaded: %s\n",
+ yesno(guc_fw->load_status ==
+ INTEL_UC_FIRMWARE_SUCCESS));
+ err_printf(m, "GuC fw version: %d.%d\n",
+ guc_fw->major_ver_found, guc_fw->minor_ver_found);
+ }
+

Quoted 4 lines
Quoted 2 lines

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

Quoted 9 lines

If it occurs to you that we need it for post-mortem debugging and having it is worth more than any potential confusion....

I can see the need for knowing what guc/huc/dmc/etc was running at the time of a hang - I just hope that what was previously running before an earlier reset doesn't contribute. But that's why we focus on the first error in a system...
-Chris

GT reset count is present already in error state. GuC kernel parameters are present and this change will help us identify which firmware issue was encountered.
So I feel printing ver_found should be enough.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
In reply to Chris Wilson
Quoted 41 lines · Chris Wilson
Quoted 34 lines · Michal Wajdeczko
Quoted 33 lines · Chris Wilson
Quoted 31 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>

---

  drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
  1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2b1d15668192..e022187916ee 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,

                            CSR_VERSION_MINOR(csr->version));
         }

+ if (HAS_GUC_UCODE(dev_priv)) {
+ struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+ err_printf(m, "GuC loaded: %s\n",
+ yesno(guc_fw->load_status ==
+ INTEL_UC_FIRMWARE_SUCCESS));
+ err_printf(m, "GuC fw version: %d.%d\n",
+ guc_fw->major_ver_found, guc_fw->minor_ver_found);
+ }
+

Quoted 5 lines
Quoted 2 lines

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

Quoted 7 lines

If it occurs to you that we need it for post-mortem debugging and having it is worth more than any potential confusion....

I can see the need for knowing what guc/huc/dmc/etc was running at the time of a hang - I just hope that what was previously running before an earlier reset doesn't contribute. But that's why we focus on the first error in a system...

Can the firmware change?
Last time I checked the filename was hard-coded in the driver. It's true that the load process could fail and then the information be incorrect.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw
Quoted 50 lines · Michel Thierry
Quoted 41 lines · Chris Wilson
Quoted 37 lines · Michal Wajdeczko
Quoted 22 lines · Chris Wilson
Quoted 21 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +0 -0
index 2b1d15668192..e022187916ee 100644
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                           CSR_VERSION_MINOR(csr->version));
        }
 
Quoted 13 lines

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 644

Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10 -0
+       if (HAS_GUC_UCODE(dev_priv)) {
+               struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+               err_printf(m, "GuC loaded: %s\n",
+                          yesno(guc_fw->load_status ==
+                                INTEL_UC_FIRMWARE_SUCCESS));
+               err_printf(m, "GuC fw version: %d.%d\n",
+                          guc_fw->major_ver_found, guc_fw->minor_ver_found);
+       }
+

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Quoted 2 lines

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

Quoted 7 lines

If it occurs to you that we need it for post-mortem debugging and having it is worth more than any potential confusion....

I can see the need for knowing what guc/huc/dmc/etc was running at the time of a hang - I just hope that what was previously running before an earlier reset doesn't contribute. But that's why we focus on the first error in a system...

Quoted 4 lines

Can the firmware change?
Last time I checked the filename was hard-coded in the driver. It's true that the load process could fail and then the information be incorrect.

Assume it won't be hardcoded for ever (or at least no more than a week)... And yes, the filesystem state may have changed since the previous load. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw
Quoted 51 lines · Chris Wilson
Quoted 50 lines · Michel Thierry
Quoted 48 lines · Chris Wilson
Quoted 37 lines · Michal Wajdeczko
Quoted 22 lines · Chris Wilson
Quoted 21 lines · Sagar A

On 2/24/2017 4:41 AM, Michel Thierry wrote:

There was no way to check if the platform is running the latest firmware.

Cc Tvrtko Ursulin [2]<[email protected]>
Cc Arkadiusz Hiler [3]<[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +0 -0
index 2b1d15668192..e022187916ee 100644
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
                           CSR_VERSION_MINOR(csr->version));
        }
 
Quoted 13 lines

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 644

Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10 -0
+       if (HAS_GUC_UCODE(dev_priv)) {
+               struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
+
+               err_printf(m, "GuC loaded: %s\n",
+                          yesno(guc_fw->load_status ==
+                                INTEL_UC_FIRMWARE_SUCCESS));
+               err_printf(m, "GuC fw version: %d.%d\n",
+                          guc_fw->major_ver_found, guc_fw->minor_ver_found);
+       }
+

Hmm. The firmware may change between the hang and cat /sys/class/drm/card0/error (as it will be reloaded after the reset).

Quoted 2 lines

Btw, maybe we should add counter that will be incremented on each fw reload and reported here ?

If it occurs to you that we need it for post-mortem debugging and having it is worth more than any potential confusion....

I can see the need for knowing what guc/huc/dmc/etc was running at the time of a hang - I just hope that what was previously running before an earlier reset doesn't contribute. But that's why we focus on the first error in a system...

Quoted 7 lines
Quoted 4 lines

Can the firmware change?
Last time I checked the filename was hard-coded in the driver. It's true that the load process could fail and then the information be incorrect.

Assume it won't be hardcoded for ever (or at least no more than a week)... And yes, the filesystem state may have changed since the previous load.

ok, I'll add an i915_capture_fw_state to collect the information before the reset (for dmc/guc/huc).

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
In reply to Michel Thierry
Quoted 1 line · Michel Thierry

There was no way to check if the platform is running the latest firmware.

Can we also add similar patch for the HuC ?

Quoted 13 lines
Cc Tvrtko Ursulin <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +0 -0
index 2b1d15668192..e022187916ee 100644

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 636

Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2 -0
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 			   CSR_VERSION_MINOR(csr->version));
 	}
 
+	if (HAS_GUC_UCODE(dev_priv)) {
+		struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;

I would preffer to use HAS_GUC and intel_guc* here.

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 640

Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -0
+
+		err_printf(m, "GuC loaded: %s\n",
+			   yesno(guc_fw->load_status ==
+				 INTEL_UC_FIRMWARE_SUCCESS));

Hmm, as we do have more detailed load status, why limiting it to yes/no only?

-Michal

Quoted 14 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -0
+		err_printf(m, "GuC fw version: %d.%d\n",
+			   guc_fw->major_ver_found, guc_fw->minor_ver_found);
+	}
+
 	err_printf(m, "EIR: 0x%08x\n", error->eir);
 	err_printf(m, "IER: 0x%08x\n", error->ier);
 	for (i = 0; i < error->ngtier; i++)
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw
Quoted 5 lines · Michal Wajdeczko
Quoted 1 line · Michel Thierry

There was no way to check if the platform is running the latest firmware.

Can we also add similar patch for the HuC ?

Please don't tell me the HuC can hang the gpu too.

Quoted 42 lines
Quoted 13 lines
Cc Tvrtko Ursulin <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +0 -0
index 2b1d15668192..e022187916ee 100644

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 636

Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2 -0
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 			   CSR_VERSION_MINOR(csr->version));
 	}
 
+	if (HAS_GUC_UCODE(dev_priv)) {
+		struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;

I would preffer to use HAS_GUC and intel_guc* here.

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 640

Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -0
+
+		err_printf(m, "GuC loaded: %s\n",
+			   yesno(guc_fw->load_status ==
+				 INTEL_UC_FIRMWARE_SUCCESS));

Hmm, as we do have more detailed load status, why limiting it to yes/no only?

-Michal

Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -1
+		err_printf(m, "GuC fw version: %d.%d\n",
+			   guc_fw->major_ver_found, guc_fw->minor_ver_found);
+	}
+
 	err_printf(m, "EIR: 0x%08x\n", error->eir);
 	err_printf(m, "IER: 0x%08x\n", error->ier);
 	for (i = 0; i < error->ngtier; i++)
--

2.11.0

Quoted 4 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw
Quoted 43 lines · Michel Thierry
Quoted 6 lines · Michal Wajdeczko
Quoted 2 lines · Michel Thierry

There was no way to check if the platform is running the latest firmware.

Can we also add similar patch for the HuC ?

Please don't tell me the HuC can hang the gpu too.

Quoted 31 lines
Quoted 14 lines
Cc Tvrtko Ursulin <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_gpu_error.c +0 -0
index 2b1d15668192..e022187916ee 100644

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct · line 637

Quoted 6 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2 -0
@@ -632,6 +632,16 @@ int i915_error_state_to_str(struct
 drm_i915_error_state_buf *m,
                CSR_VERSION_MINOR(csr->version));
     }
 
+    if (HAS_GUC_UCODE(dev_priv)) {
+        struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;

I would preffer to use HAS_GUC and intel_guc* here.

drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 640

Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -0
+
+        err_printf(m, "GuC loaded: %s\n",
+               yesno(guc_fw->load_status ==
+                 INTEL_UC_FIRMWARE_SUCCESS));

Hmm, as we do have more detailed load status, why limiting it to yes/no only?

Will it help in the post-mortem debug?
My idea was, if the fw didn't load, we can take it completely out of the picture.

Quoted 12 lines
Quoted 12 lines

-Michal

Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4 -0
+        err_printf(m, "GuC fw version: %d.%d\n",
+               guc_fw->major_ver_found, guc_fw->minor_ver_found);
+    }
+
     err_printf(m, "EIR: 0x%08x\n", error->eir);
     err_printf(m, "IER: 0x%08x\n", error->ier);
     for (i = 0; i < error->ngtier; i++)

--
2.11.0

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx