drm/i915/guc: Add GuC Load time to debugfs
Subsystems (2)
PATCH 1/2 drm/i915/guc: Add GuC Load time to debugfs
Calculate the time that GuC takes to load. This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
v2: Calculate time before logs are collected. Move the guc_load_time variable as a part of intel_uc_fw struct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +3 -0
@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time)); +seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",
drivers/gpu/drm/i915/intel_guc_loader.c +8 -0
@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;
@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); + guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up.
@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load; +DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);
@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time; };struct intel_guc_log {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/huc: Add HuC Load time to debugfs
This patch uses jiffies to calculate the huc
load time and add it as a field to debugfs.
This information can be useful for testing
to know how much time huc takes to load.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 ++ drivers/gpu/drm/i915/intel_huc.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 11 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +2 -0
@@ -2349,6 +2349,8 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data) huc_fw->header_offset, huc_fw->header_size);seq_printf (m,"\tuCode: offset is %d; size = %d\n" , huc_fw->ucode_offset, huc_fw->ucode_size); +seq_printf (m,"\tHuC load time is %lu ms\n" , +jiffies_to_msecs (huc_fw->huc_load_time));seq_printf (m,"\tRSA: offset is %d; size = %d\n" , huc_fw->rsa_offset, huc_fw->rsa_size);
drivers/gpu/drm/i915/intel_huc.c +8 -0
@@ -90,6 +90,7 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)unsigned long offset =0 ;u32 size;int ret; +unsigned long huc_start_load, huc_finish_load; ret =i915_gem_object_set_to_gtt_domain (huc_fw->obj, false);if (ret) {
@@ -121,11 +122,15 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)I915_WRITE (DMA_COPY_SIZE , size);/* Start the DMA */ + huc_start_load = jiffies;I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (HUC_UKERNEL |START_DMA ));/* Wait for DMA to finish */ ret =wait_for ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,100 ); + huc_finish_load = jiffies; + huc_fw->huc_load_time = huc_finish_load - huc_start_load; +DRM_DEBUG_DRIVER ("HuC DMA transfer wait over with ret %d\n" , ret);/* Disable the bits once DMA is over */
@@ -218,6 +223,9 @@ void intel_huc_init_hw(struct intel_huc *huc)intel_uc_fw_status_repr (huc->fw.fetch_status), intel_uc_fw_status_repr(huc->fw.load_status)); +DRM_DEBUG_DRIVER ("Time taken to load HuC %lu" , + huc->fw.huc_load_time); +if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )DRM_ERROR ("Failed to complete HuC uCode load with ret %d\n" , err);
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -155,6 +155,7 @@ struct intel_uc_fw {uint32_t ucode_size;uint32_t ucode_offset;unsigned long guc_load_time; +unsigned long huc_load_time; };struct intel_guc_log {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Add GuC Load time to debugfs
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Add GuC Load time to debugfs
URL : https://patchwork.freedesktop.org/series/29921/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/i915_debugfs.o
drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_huc_load_status_info’:
drivers/gpu/drm/i915/i915_debugfs.c:2352:38: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘unsigned int’ [-Werror=format=]
seq_printf(m, "\tHuC load time is %lu ms\n",
^
drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_guc_load_status_info’:
drivers/gpu/drm/i915/i915_debugfs.c:2384:38: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘unsigned int’ [-Werror=format=]
seq_printf(m, "\tGuC Load time is %lu ms\n",
^cc1: all warnings being treated as errorsscripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_debugfs.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_debugfs.o] Error 1 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Anusha Srivatsa
Calculate the time that GuC takes to load. This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
Do we need this in debugfs or a DRM_NOTE or something would be sufficient if the load time is above certain threshold?
Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Depending on the above, more or less applicable comments below:
Quoted 21 lines
v2: Calculate time before logs are collected. Move the
guc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));
OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
Quoted 25 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); + guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up.
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 243
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;
Strictly speaking you don't need the guc_finish_load local.
Quoted 19 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }drivers/gpu/drm/i915/intel_uc.h +0
-0
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;
Looks wrong to add guc_ (and later huc_) prefixed members in the common struct since both intel_guc and intel_huc encapsulate it. If you just had a single field and called it load_time, wouldn't you get separate copies for guc and huc automatically?
Regards,
Tvrtko
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 160
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 31 lines · Tvrtko Ursulin
Quoted 4 lines · Anusha Srivatsa
Calculate the time that GuC takes to load. This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Depending on the above, more or less applicable comments below:
Quoted 16 lines
v2: Calculate time before logs are collected. Move the
guc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)
Quoted 13 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
We can also skip "Guc" prefix as all entries are under "GuC firmware status" And maybe better place will be to insert it right after existing "load" entry? Then output will be:
GuC firmware status: path: i915/xxx.bin fetch: SUCCESS load: SUCCESS load time: 10ms ...
or we can even try to combine both entries:
GuC firmware status: path: i915/xxx.bin fetch: SUCCESS load: SUCCESS 10ms ...
Quoted 47 lines
Quoted 23 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); + guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up. drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 242
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;Strictly speaking you don't need the
guc_finish_loadlocal.Quoted 17 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }drivers/gpu/drm/i915/intel_uc.h +0
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;Looks wrong to add
guc_(and laterhuc_) prefixed members in the common struct since bothintel_gucandintel_hucencapsulate it. If you just had a single field and called itload_time, wouldn't you get separate copies for guc and huc automatically?
Additionally, move this new member closer to related "load_status" member.
Regards,
Michal
Quoted 5 lines
Regards,
Tvrtko
Quoted 7 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw {
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {_______________________________________________
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
Quoted 41 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Thursday, September 7, 2017 3:23 AM
To: Tvrtko Ursulin <[email protected]>
Cc: Srivatsa, Anusha <[email protected]>; intel- [email protected]; Sundaresan, Sujaritha <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Add GuC Load time to debugfsQuoted 29 lines · Tvrtko Ursulin
Quoted 3 lines · Anusha Srivatsa
Calculate the time that GuC takes to load.
This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Depending on the above, more or less applicable comments below:
Quoted 15 lines
v2: Calculate time before logs are collected.
Move theguc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)
Quoted 15 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file*m, void *data)
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
I don't have a strong preference, either way works. I can change it in the next revision.
Quoted 11 lines
We can also skip "Guc" prefix as all entries are under "GuC firmware status" And maybe better place will be to insert it right after existing "load" entry? Then output will be:
GuC firmware status: path: i915/xxx.bin fetch: SUCCESS load: SUCCESS load time: 10ms ...
Quoted 8 lines
or we can even try to combine both entries:
GuC firmware status: path: i915/xxx.bin fetch: SUCCESS load: SUCCESS 10ms ...
I agree with removing the GuC_ prefix. I like the first output more somehow.... it tells status, and then the time taken for load.....
Thanks Michal for your inputs....
Anusha
Quoted 61 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n", diff --git
a/drivers/gpu/drm/i915/intel_guc_loader.cb/drivers/gpu/drm/i915/intel_guc_loader.c
index8b0ae7fce7f2..da917f84c471100644drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct
drm_i915_private*dev_priv,Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct
drm_i915_private*dev_priv,Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct · line 228
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0/* Finally start the DMA */ I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up. @@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct
drm_i915_private*dev_priv,Quoted 25 lines
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 243
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;Strictly speaking you don't need the
guc_finish_loadlocal.Quoted 18 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex22ae52b17b0f..52aa05d13863100644drivers/gpu/drm/i915/intel_uc.h +0
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;Looks wrong to add
guc_(and laterhuc_) prefixed members in the common struct since bothintel_gucandintel_hucencapsulate it. If you just had a single field and called itload_time, wouldn't you get separate copies for guc and huc automatically?
Quoted 17 lines
Additionally, move this new member closer to related "
load_status" member.Regards,
MichalQuoted 12 lines
Regards,
Tvrtko
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw {
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {_______________________________________________
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
Quoted 11 lines
-----Original Message-----
From: Tvrtko Ursulin [mailto:[email protected]]
Sent: Thursday, September 7, 2017 1:49 AM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Sundaresan, Sujaritha <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Add GuC Load time to debugfs
Quoted 7 lines
Quoted 3 lines · Anusha Srivatsa
Calculate the time that GuC takes to load.
This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?
The intention was to have debug related info in a debugfs. DRM_NOTE will also be useful, we can do both. The load time can be as an entry in debugfs and if it's beyond a threshold - 20ms I assume, we can have a DRM_NOTE. Does that sound good?
Quoted 2 lines
Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Usually guc load times are around 8ms to 10ms....
That’s a very good point. I thought jiffies are a good approach for this purpose, but if there is a better or more accurate way, I will be happy to go that direction.
Quoted 85 lines
Depending on the above, more or less applicable comments below:
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file
Quoted 21 lines
v2: Calculate time before logs are collected.
Move theguc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file*m, void *data)
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n", diff --git
a/drivers/gpu/drm/i915/intel_guc_loader.cb/drivers/gpu/drm/i915/intel_guc_loader.c
index8b0ae7fce7f2..da917f84c471100644drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct · line 230
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up.
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 243
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;Strictly speaking you don't need the
guc_finish_loadlocal.Quoted 14 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }
Quoted 15 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 10 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex22ae52b17b0f..52aa05d13863100644drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;Looks wrong to add
guc_(and laterhuc_) prefixed members in the common struct since bothintel_gucandintel_hucencapsulate it. If you just had a single field and called itload_time, wouldn't you get separate copies for guc and huc automatically?
That’s a good point.
Neater approach too. Thanks Tvrtko!
Anusha
Quoted 8 lines
Regards,
Tvrtko
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Anusha
Quoted 14 lines
-----Original Message-----
From: Tvrtko Ursulin [mailto:[email protected]]
Sent: Thursday, September 7, 2017 1:49 AM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Sundaresan, Sujaritha <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Add GuC Load time to debugfsQuoted 3 lines · Anusha Srivatsa
Calculate the time that GuC takes to load.
This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
Quoted 5 lines
Quoted 2 lines
Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?The intention was to have debug related info in a debugfs.
DRM_NOTEwill also be useful, we can do both. The load time can be as an entry in debugfs and if it's beyond a threshold - 20ms I assume, we can have aDRM_NOTE. Does that sound good?
I'd rather avoid adding code (for debugfs) if the only purpose is to detect when the load takes too long. But maybe there is a different reason to have it, which I am not aware off so I don't know.
Quoted 5 lines
Quoted 2 lines
Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Usually guc load times are around 8ms to 10ms....
That’s a very good point. I thought jiffies are a good approach for this purpose, but if there is a better or more accurate way, I will be happy to go that direction.
ktime_get(_ns) I think.
Regards,
Tvrtko
Quoted 101 lines
Quoted 85 lines
Depending on the above, more or less applicable comments below:
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file
Quoted 21 lines
v2: Calculate time before logs are collected.
Move theguc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file*m, void *data)
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n", diff --git
a/drivers/gpu/drm/i915/intel_guc_loader.cb/drivers/gpu/drm/i915/intel_guc_loader.c
index8b0ae7fce7f2..da917f84c471100644drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct · line 230
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up.
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 243
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;Strictly speaking you don't need the
guc_finish_loadlocal.Quoted 14 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }Quoted 15 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 10 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex22ae52b17b0f..52aa05d13863100644drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;Looks wrong to add
guc_(and laterhuc_) prefixed members in the common struct since bothintel_gucandintel_hucencapsulate it. If you just had a single field and called itload_time, wouldn't you get separate copies for guc and huc automatically?
Quoted 12 lines
That’s a good point.
Neater approach too. Thanks Tvrtko!Anusha
Quoted 8 lines
Regards,
Tvrtko
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Tvrtko Ursulin (2017-09-07 09:49:02)
Quoted 7 lines · Anusha Srivatsa
Quoted 4 lines
Calculate the time that GuC takes to load. This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
Quoted 5 lines
Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Hear, hear. Aiming for jiffie resolution sets a very low bar.
Why is this important anyway? It shouldn't be on the critical path for bringing up userspace (i.e. on the synchronous portion of boot/module loading). Nor should it be delaying bringing up a screen, once the core is initialised we should be able to bring up GT and the display in parallel.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 23 lines
-----Original Message-----
From: Chris Wilson [mailto:[email protected]]
Sent: Thursday, September 7, 2017 3:08 PM
To: Tvrtko Ursulin <[email protected]>; Srivatsa, Anusha <[email protected]>; [email protected]
Cc: Sundaresan, Sujaritha <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Add GuC Load time to debugfsQuoting Tvrtko Ursulin (2017-09-07 09:49:02)
Quoted 11 lines · Anusha Srivatsa
Quoted 3 lines
Calculate the time that GuC takes to load.
This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Quoted 6 lines
Hear, hear. Aiming for jiffie resolution sets a very low bar.
Why is this important anyway? It shouldn't be on the critical path for bringing up userspace (i.e. on the synchronous portion of boot/module loading). Nor should it be delaying bringing up a screen, once the core is initialised we should be able to bring up GT and the display in parallel.
Hi Chris,
Wont it still be of some value to know the time taken to load the firmware in different platforms? To have some data to tell how much time it takes to load?
Anusha
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Srivatsa, Anusha (2017-09-08 18:58:11)
Quoted 25 lines
Quoted 25 lines
-----Original Message-----
From: Chris Wilson [mailto:[email protected]]
Sent: Thursday, September 7, 2017 3:08 PM
To: Tvrtko Ursulin <[email protected]>; Srivatsa, Anusha <[email protected]>; [email protected]
Cc: Sundaresan, Sujaritha <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/guc: Add GuC Load time to debugfsQuoting Tvrtko Ursulin (2017-09-07 09:49:02)
Quoted 11 lines · Anusha Srivatsa
Quoted 3 lines
Calculate the time that GuC takes to load.
This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Hear, hear. Aiming for jiffie resolution sets a very low bar.
Quoted 7 lines
Quoted 4 lines
Why is this important anyway? It shouldn't be on the critical path for bringing up userspace (i.e. on the synchronous portion of boot/module loading). Nor should it be delaying bringing up a screen, once the core is initialised we should be able to bring up GT and the display in parallel.
Hi Chris,
Wont it still be of some value to know the time taken to load the firmware in different platforms? To have some data to tell how much time it takes to load?
If it always reports 0 jiffies that is not much use. Why do you need to add code to do this since you can just log the function call timings? -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Tvrtko Ursulin
Quoted 4 lines · Anusha Srivatsa
Calculate the time that GuC takes to load. This information could be very useful in determining if GuC is taking unreasonably long time to load in a certain platforms.
Do we need this in debugfs or a
DRM_NOTEor something would be sufficient if the load time is above certain threshold?
Yeah I'd vote for dmesg logging too.
-Daniel
Quoted 102 lines
Also, what are the typical times here? Are jiffies precise enough? Could be only 10ms granularity on some kernels.
Depending on the above, more or less applicable comments below:
Quoted 21 lines
v2: Calculate time before logs are collected. Move the
guc_load_timevariable as a part ofintel_uc_fwstruct. Store only final result which is to be exported to debugfs. (Michal) Add the load time in the print message as well.Cc Sujaritha Sundaresan <[email protected]>Cc Oscar Mateo <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ drivers/gpu/drm/i915/intel_guc_loader.c | 8 ++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 3 files changed, 12 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_load_status_info(struct seq_file *m, void *data) · line 2383
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0@@ -2379,6 +2379,9 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , guc_fw->major_ver_found, guc_fw->minor_ver_found); +seq_printf (m,"\tGuC Load time is %lu ms\n" , +jiffies_to_msecs (guc_fw->guc_load_time));OCD: "GuC load time: %lums" to make it more consistent with the other entries here?
Quoted 22 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -199,6 +199,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];int i, ret =0 ; +unsigned long guc_start_load, guc_finish_load;/* where RSA signature starts */ offset = guc_fw->rsa_offset;@@ -226,6 +227,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* Finally start the DMA */ I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); + guc_start_load = jiffies;/* * Wait for the DMA to complete & the GuC to start up. drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv, · line 242
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -237,6 +239,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,*/ ret =wait_for (guc_ucode_response (dev_priv, &status),100 ); + guc_finish_load = jiffies; + guc_fw->guc_load_time = guc_finish_load - guc_start_load;Strictly speaking you don't need the
guc_finish_loadlocal.Quoted 16 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+DRM_DEBUG_DRIVER ("DMA status 0x%x, GuC status 0x%x\n" ,I915_READ (DMA_CTRL ), status);@@ -372,6 +377,9 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found); +DRM_DEBUG_DRIVER ("Time taken to load GuC is %lu\n" , + guc->fw.guc_load_time); +return 0 ; }drivers/gpu/drm/i915/intel_uc.h +0
-0drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 157
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -154,6 +154,7 @@ struct intel_uc_fw {uint32_t rsa_offset;uint32_t ucode_size;uint32_t ucode_offset; +unsigned long guc_load_time;Looks wrong to add
guc_(and laterhuc_) prefixed members in the common struct since bothintel_gucandintel_hucencapsulate it. If you just had a single field and called itload_time, wouldn't you get separate copies for guc and huc automatically?Regards,
Tvrtko
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw {
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0};struct intel_guc_log {_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx