Skip to contentSkip to conversation

drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/

PATCH In review Sagar Arun Kamble 3 participants 6 messages Mar 1, 2018

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

PATCH 1/1 drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/

GuC and HuC get loaded from intel_uc_init_hw. HuC load function is named intel_huc_init_hw, however GuC load function is still named in old style as intel_guc_fw_upload. Update it and the function doc. for both functions.
Move of GuC load function's def. & decl. to intel_guc.c|h seems necessary as it is more about core GuC functionality and not so much about fw itself. This can be done in later patch if needed.

Cc Michal Winiarski <[email protected]>
Cc Michal Wajdeczko <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_fw.c | 12 ++++++------
 drivers/gpu/drm/i915/intel_guc_fw.h |  2 +-
 drivers/gpu/drm/i915/intel_huc.c    |  8 ++++----
 drivers/gpu/drm/i915/intel_uc.c     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +6 -6
index 3b09329..916dc64 100644
@@ -269,19 +269,19 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma)
 }
 
 /**
- * intel_guc_fw_upload() - finish preparing the GuC for activity
+ * intel_guc_init_hw() - load GuC uCode to device
  * @guc: intel_guc structure
  *
- * Called during driver loading and also after a GPU reset.
+ * Called from intel_uc_init_hw() during driver load, resume from sleep and
+ * after a GPU reset.
  *
- * The main action required here it to load the GuC uCode into the device.
  * The firmware image should have already been fetched into memory by the
- * earlier call to intel_guc_init(), so here we need only check that
- * worked, and then transfer the image to the h/w.
+ * earlier call to intel_uc_init_fw(), so here we need to only check that
+ * fetch succeeded, and then transfer the image to the h/w.
  *
  * Return:	non-zero code on error
  */
-int intel_guc_fw_upload(struct intel_guc *guc)
+int intel_guc_init_hw(struct intel_guc *guc)
 {
 	return intel_uc_fw_upload(&guc->fw, guc_fw_xfer);
 }
drivers/gpu/drm/i915/intel_guc_fw.h +1 -1
index 4ec5d3d..6042fd0 100644
@@ -28,6 +28,6 @@
 struct intel_guc;
 
 void intel_guc_fw_init_early(struct intel_guc *guc);
-int intel_guc_fw_upload(struct intel_guc *guc);
+int intel_guc_init_hw(struct intel_guc *guc);
 
 #endif
drivers/gpu/drm/i915/intel_huc.c +4 -4
index ef9a05d..5e58c8c 100644
@@ -171,12 +171,12 @@ static int huc_ucode_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma)
  * intel_huc_init_hw() - load HuC uCode to device
  * @huc: intel_huc structure
  *
- * Called from intel_uc_init_hw() during driver loading and also after a GPU
- * reset. Be note that HuC loading must be done before GuC loading.
+ * Called from intel_uc_init_hw() during driver load, resume from sleep and
+ * after a GPU reset. Note that HuC must be loaded before GuC.
  *
  * The firmware image should have already been fetched into memory by the
- * earlier call to intel_uc_init_fw(), so here we need only check that
- * is succeeded, and then transfer the image to the h/w.
+ * earlier call to intel_uc_init_fw(), so here we need to only check that
+ * fetch succeeded, and then transfer the image to the h/w.
  *
  */
 int intel_huc_init_hw(struct intel_huc *huc)
drivers/gpu/drm/i915/intel_uc.c +1 -1
index 9f1bac6..69c8643 100644
@@ -367,7 +367,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 		}
 
 		intel_guc_init_params(guc);
-		ret = intel_guc_fw_upload(guc);
+		ret = intel_guc_init_hw(guc);
 		if (ret == 0 || ret != -EAGAIN)
 			break;
 
Signature · 6 lines
2.7.4

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

✓ Fi.CI.BAT: success for series starting with [1/1] drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/

== Series Details ==

== Series Details ==

Series: series starting with [1/1] drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/
URL : https://patchwork.freedesktop.org/series/39192/
State : success

== Summary ==

Series 39192v1 series starting with [1/1] drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/
https://patchwork.freedesktop.org/api/1.0/series/39192/revisions/1/mbox/

---- Known issues:

Test kms_busy:

        Subgroup basic-flip-b:
                fail       -> PASS       (fi-elk-e7500) fdo#103989

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:417s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:422s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:371s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:486s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:285s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:476s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:470s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:460s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:391s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:559s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:416s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:287s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:510s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:386s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:411s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:443s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:409s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:452s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:494s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:448s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:492s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:593s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:424s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:500s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:520s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:495s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:471s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:406s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:521s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:393s

f12b759446c40a25a7ee0b507bd0d75e6e083a6d drm-tip: 2018y-03m-01d-07h-28m-47s UTC integration manifest 964f4509fd30 drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8193/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Sagar Arun Kamble
Quoted 8 lines · Sagar Arun Kamble

GuC and HuC get loaded from intel_uc_init_hw. HuC load function is named intel_huc_init_hw, however GuC load function is still named in old style as intel_guc_fw_upload. Update it and the function doc. for both functions.
Move of GuC load function's def. & decl. to intel_guc.c|h seems necessary as it is more about core GuC functionality and not so much about fw itself. This can be done in later patch if needed.

Function intel_guc_fw_upload() was named this way on purpose to follow object-verb naming pattern, where our object is GuC FW (hence file name intel_guc_fw.*)

There was a plan to unify this approach with HuC but in the opposite way:
by moving HuC firmware selection code to intel_huc_fw.* but since only one function will be left in intel_huc.c this action was deferred.

Note that there will be nothing wrong to call fw_upload functions from our uc_init_hw function:

intel_uc_init_hw()
intel_uc_reset()
intel_huc_fw_upload()
intel_guc_fw_upload()
intel_guc_enable_comm()
intel_huc_auth()

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

#3 lore raw
Quoted 11 lines · Michal Wajdeczko
Quoted 8 lines · Sagar Arun Kamble

GuC and HuC get loaded from intel_uc_init_hw. HuC load function is named intel_huc_init_hw, however GuC load function is still named in old style as intel_guc_fw_upload. Update it and the function doc. for both functions.
Move of GuC load function's def. & decl. to intel_guc.c|h seems necessary as it is more about core GuC functionality and not so much about fw itself. This can be done in later patch if needed.

Quoted 8 lines

Function intel_guc_fw_upload() was named this way on purpose to follow object-verb naming pattern, where our object is GuC FW (hence file name intel_guc_fw.*)

There was a plan to unify this approach with HuC but in the opposite way:
by moving HuC firmware selection code to intel_huc_fw.* but since only one function will be left in intel_huc.c this action was deferred.

Thanks for background on this.

Quoted 6 lines

Note that there will be nothing wrong to call fw_upload functions from our uc_init_hw function:

intel_uc_init_hw()
  intel_uc_reset()
  intel_huc_fw_upload()

Will just do HuC name change (s/intel_huc_init_hw/intel_huc_fw_upload/) and comments update. HuC related move can be done later. Is that ok?

Quoted 6 lines

intel_guc_fw_upload()
  intel_guc_enable_comm()
  intel_huc_auth()

/Michal

Signature · 7 lines
Thanks,
Sagar

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 23 lines · Sagar Arun Kamble
Quoted 11 lines · Michal Wajdeczko
Quoted 8 lines · Sagar Arun Kamble

GuC and HuC get loaded from intel_uc_init_hw. HuC load function is named intel_huc_init_hw, however GuC load function is still named in old style as intel_guc_fw_upload. Update it and the function doc. for both functions.
Move of GuC load function's def. & decl. to intel_guc.c|h seems necessary as it is more about core GuC functionality and not so much about fw itself. This can be done in later patch if needed.

Quoted 8 lines

Function intel_guc_fw_upload() was named this way on purpose to follow object-verb naming pattern, where our object is GuC FW (hence file name intel_guc_fw.*)

There was a plan to unify this approach with HuC but in the opposite way:
by moving HuC firmware selection code to intel_huc_fw.* but since only one function will be left in intel_huc.c this action was deferred.

Thanks for background on this.

Quoted 8 lines
Quoted 6 lines

Note that there will be nothing wrong to call fw_upload functions from our uc_init_hw function:

intel_uc_init_hw()
intel_uc_reset()
intel_huc_fw_upload()

Will just do HuC name change (s/intel_huc_init_hw/intel_huc_fw_upload/) and comments update. HuC related move can be done later. Is that ok?

Hmm, I've mixed feelings, as on one hand, this small step will unify fw_upload calls, but at the same time it will break object-verb pattern in intel_huc.* files ... so maybe we should do it only right?

Quoted 6 lines
Quoted 6 lines

intel_guc_fw_upload()
intel_guc_enable_comm()
intel_huc_auth()

/Michal

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

#5 lore raw

✓ Fi.CI.IGT: success for series starting with [1/1] drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/

In reply to Sagar Arun Kamble
== Series Details ==

== Series Details ==

Series: series starting with [1/1] drm/i915/guc: s/intel_guc_fw_upload/intel_guc_init_hw/
URL : https://patchwork.freedesktop.org/series/39192/
State : success

== Summary ==

---- Known issues:

Test gem_eio:

        Subgroup in-flight-contexts:
                pass       -> INCOMPLETE (shard-apl) fdo#104945 +1
Test gem_partial_pwrite_pread:
        Subgroup write-snoop:
                incomplete -> PASS       (shard-hsw) fdo#103540
Test kms_chv_cursor_fail:
        Subgroup pipe-b-256x256-left-edge:
                pass       -> DMESG-WARN (shard-snb) fdo#105185 +1
Test kms_flip:
        Subgroup flip-vs-expired-vblank-interruptible:
                fail       -> PASS       (shard-hsw) fdo#102887
        Subgroup plain-flip-ts-check:
                pass       -> FAIL       (shard-hsw) fdo#100368
Test perf:
        Subgroup enable-disable:
                fail       -> PASS       (shard-apl) fdo#103715

fdo#104945 https://bugs.freedesktop.org/show_bug.cgi?id=104945
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715

shard-apl        total:3335 pass:1758 dwarn:1   dfail:0   fail:6   skip:1566 time:11069s
shard-hsw        total:3460 pass:1766 dwarn:1   dfail:0   fail:2   skip:1690 time:11737s
shard-snb        total:3460 pass:1358 dwarn:2   dfail:0   fail:1   skip:2099 time:6646s

Blacklisted hosts:
shard-kbl total:3442 pass:1914 dwarn:11 dfail:0 fail:7 skip:1509 time:9271s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8193/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx