drm/i915/guc: Unify parameters of public CT functions
Subsystems (2)
PATCH 1/1 drm/i915/guc: Unify parameters of public CT functions
There is no need to mix parameter types in public CT functions as we can always accept intel_guc_ct.
--- drivers/gpu/drm/i915/intel_guc_ct.c | 34 ++++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_guc_ct.h | 6 ++---- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- 3 files changed, 28 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_guc_ct.c +24 -10
@@ -28,12 +28,21 @@enum {CTB_OWNER_HOST =0 }; +/** +* intel_guc_ct_init_early - Initialize CT state without requiring device access +* @ct: pointer to CT struct +*/ void intel_guc_ct_init_early (struct intel_guc_ct *ct) {/* we're using static channel owners */ ct->host_channel.owner =CTB_OWNER_HOST ; } +static inline struct intel_guc *ct_to_guc (struct intel_guc_ct *ct) +{ + return container_of(ct, struct intel_guc, ct); +} +static inline const char *guc_ct_buffer_type_to_str (u32 type) {switch (type) {
@@ -416,16 +425,19 @@ static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) }/** -* Enable buffer based command transport +* intel_guc_ct_enable - Enable buffer based command transport. +* @ct: pointer to CT struct +* * Shall only be called for platforms with HAS_GUC_CT. -* @guc: the guc -* return: 0 on success -* non-zero on failure +* +* Returns: +* 0 on success, a negative errno code on failure. */ -int intel_guc_enable_ct (struct intel_guc *guc) +int intel_guc_ct_enable (struct intel_guc_ct *ct) { +struct intel_guc *guc =ct_to_guc (ct);struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; +struct intel_guc_ct_channel *ctch = &ct->host_channel;int err;GEM_BUG_ON (!HAS_GUC_CT (dev_priv));
@@ -441,14 +453,16 @@ int intel_guc_enable_ct(struct intel_guc *guc) }/** -* Disable buffer based command transport. +* intel_guc_ct_disable - Disable buffer based command transport. +* @ct: pointer to CT struct +* * Shall only be called for platforms with HAS_GUC_CT. -* @guc: the guc */ -void intel_guc_disable_ct (struct intel_guc *guc) +void intel_guc_ct_disable (struct intel_guc_ct *ct) { +struct intel_guc *guc =ct_to_guc (ct);struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; +struct intel_guc_ct_channel *ctch = &ct->host_channel;GEM_BUG_ON (!HAS_GUC_CT (dev_priv));
drivers/gpu/drm/i915/intel_guc_ct.h +2 -4
@@ -78,9 +78,7 @@ struct intel_guc_ct { };void intel_guc_ct_init_early (struct intel_guc_ct *ct); - -/* XXX: move to intel_uc.h ? don't fit there either */ -int intel_guc_enable_ct (struct intel_guc *guc); -void intel_guc_disable_ct (struct intel_guc *guc); +int intel_guc_ct_enable (struct intel_guc_ct *ct); +void intel_guc_ct_disable (struct intel_guc_ct *ct);#endif /* _INTEL_GUC_CT_H_ */
drivers/gpu/drm/i915/intel_uc.c +2 -2
@@ -232,7 +232,7 @@ static int guc_enable_communication(struct intel_guc *guc)gen9_enable_guc_interrupts (dev_priv);if (HAS_GUC_CT (dev_priv)) -return intel_guc_enable_ct (guc); +return intel_guc_ct_enable (&guc->ct); guc->send = intel_guc_send_mmio;return 0 ;
@@ -243,7 +243,7 @@ static void guc_disable_communication(struct intel_guc *guc)struct drm_i915_private *dev_priv =guc_to_i915 (guc);if (HAS_GUC_CT (dev_priv)) -intel_guc_disable_ct (guc); +intel_guc_ct_disable (&guc->ct);gen9_disable_guc_interrupts (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/guc: Unify parameters of public CT functions
== Series Details ==
== Series Details ==
Series: drm/i915/guc: Unify parameters of public CT functions
URL : https://patchwork.freedesktop.org/series/40197/
State : failure
== Summary ==
Series 40197v1 drm/i915/guc: Unify parameters of public CT functions
https://patchwork.freedesktop.org/api/1.0/series/40197/revisions/1/mbox/
---- Possible new issues:
Test kms_flip:
Subgroup basic-flip-vs-modeset:
pass -> INCOMPLETE (fi-bxt-dsi)fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:438s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:441s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:380s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:536s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:298s fi-bxt-dsi total:217 pass:194 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:513s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:513s fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:503s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:407s fi-cfl-s2 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:579s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:510s fi-cnl-drrs total:285 pass:254 dwarn:3 dfail:0 fail:0 skip:28 time:539s fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:419s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:319s fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:533s fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:403s fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:429s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:474s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:427s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:473s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:462s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:511s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:653s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:445s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:533s fi-skl-6700hq total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:541s fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:505s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:493s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:425s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:445s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:578s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:398s
9b79492f331e36cf2e08d65ab3221abb66f67844 drm-tip: 2018y-03m-19d-14h-18m-12s UTC integration manifest b6545a236eb7 drm/i915/guc: Unify parameters of public CT functions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8396/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 43 lines · Michal Wajdeczko
There is no need to mix parameter types in public CT functions as we can always accept
intel_guc_ct.Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_guc_ct.c | 34 ++++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_guc_ct.h | 6 ++---- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- 3 files changed, 28 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/intel_guc_ct.c +9
-1@@ -28,12 +28,21 @@enum {CTB_OWNER_HOST =0 }; +/** +* intel_guc_ct_init_early - Initialize CT state without requiring device access +* @ct: pointer to CT struct +*/ void intel_guc_ct_init_early (struct intel_guc_ct *ct) {/* we're using static channel owners */ ct->host_channel.owner =CTB_OWNER_HOST ; } +static inline struct intel_guc *ct_to_guc (struct intel_guc_ct *ct) +{ + return container_of(ct, struct intel_guc, ct); +} +static inline const char *guc_ct_buffer_type_to_str (u32 type) {switch (type) {@@ -416,16 +425,19 @@ static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) }/** -* Enable buffer based command transport
drivers/gpu/drm/i915/intel_guc_ct.c static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) · line 434
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_ct.c +6
-3+* intel_guc_ct_enable - Enable buffer based command transport. +* @ct: pointer to CT struct +* * Shall only be called for platforms with HAS_GUC_CT. -* @guc: the guc -* return: 0 on success -* non-zero on failure +* +* Returns: +* 0 on success, a negative errno code on failure.
Should be
* Return: 0 on sucess ...
drivers/gpu/drm/i915/intel_guc_ct.c static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) · line 439
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_ct.c +2
-1*/ -int intel_guc_enable_ct (struct intel_guc *guc) +int intel_guc_ct_enable (struct intel_guc_ct *ct) { +struct intel_guc *guc =ct_to_guc (ct);struct drm_i915_private *dev_priv =guc_to_i915 (guc);
change to *i915 as part of this patch itself? :) similar for disable. Otherwise LGTM
Quoted 64 lines
drivers/gpu/drm/i915/intel_guc_ct.c +7
-5-struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; +struct intel_guc_ct_channel *ctch = &ct->host_channel;int err;GEM_BUG_ON (!HAS_GUC_CT (dev_priv));@@ -441,14 +453,16 @@ int intel_guc_enable_ct(struct intel_guc *guc) }/** -* Disable buffer based command transport. +* intel_guc_ct_disable - Disable buffer based command transport. +* @ct: pointer to CT struct +* * Shall only be called for platforms with HAS_GUC_CT. -* @guc: the guc */ -void intel_guc_disable_ct (struct intel_guc *guc) +void intel_guc_ct_disable (struct intel_guc_ct *ct) { +struct intel_guc *guc =ct_to_guc (ct);struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct intel_guc_ct_channel *ctch = &guc->ct.host_channel; +struct intel_guc_ct_channel *ctch = &ct->host_channel;GEM_BUG_ON (!HAS_GUC_CT (dev_priv));drivers/gpu/drm/i915/intel_guc_ct.h +2
-4@@ -78,9 +78,7 @@ struct intel_guc_ct { };void intel_guc_ct_init_early (struct intel_guc_ct *ct); - -/* XXX: move to intel_uc.h ? don't fit there either */ -int intel_guc_enable_ct (struct intel_guc *guc); -void intel_guc_disable_ct (struct intel_guc *guc); +int intel_guc_ct_enable (struct intel_guc_ct *ct); +void intel_guc_ct_disable (struct intel_guc_ct *ct);#endif /* _INTEL_GUC_CT_H_ */ drivers/gpu/drm/i915/intel_uc.c +2
-2@@ -232,7 +232,7 @@ static int guc_enable_communication(struct intel_guc *guc)gen9_enable_guc_interrupts (dev_priv);if (HAS_GUC_CT (dev_priv)) -return intel_guc_enable_ct (guc); +return intel_guc_ct_enable (&guc->ct); guc->send = intel_guc_send_mmio;return 0 ;@@ -243,7 +243,7 @@ static void guc_disable_communication(struct intel_guc *guc)struct drm_i915_private *dev_priv =guc_to_i915 (guc);if (HAS_GUC_CT (dev_priv)) -intel_guc_disable_ct (guc); +intel_guc_ct_disable (&guc->ct);gen9_disable_guc_interrupts (dev_priv);
Signature · 7 lines
Thanks, Sagar _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Sagar Arun Kamble
Quoted 46 lines · Michal Wajdeczko
There is no need to mix parameter types in public CT functions as we can always accept
intel_guc_ct.Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_guc_ct.c | 34 ++++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_guc_ct.h | 6 ++---- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- 3 files changed, 28 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/intel_guc_ct.c +1
-0@@ -28,12 +28,21 @@enum {CTB_OWNER_HOST =0 }; +/** +* intel_guc_ct_init_early - Initialize CT state without requiring device access
+ * @ct: pointer to CT struct
+ */
voidintel_guc_ct_init_early(struct intel_guc_ct *ct)
{
/* we're using static channel owners */ct->host_channel.owner=CTB_OWNER_HOST;
}
+static inline structintel_guc*ct_to_guc(structintel_guc_ct*ct)drivers/gpu/drm/i915/intel_guc_ct.c +7
-1+{ + return container_of(ct, struct intel_guc, ct); +} +static inline const char *guc_ct_buffer_type_to_str (u32 type) {switch (type) {@@ -416,16 +425,19 @@ static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) }/** -* Enable buffer based command transport +* intel_guc_ct_enable - Enable buffer based command transport. +* @ct: pointer to CT struct +* * Shall only be called for platforms with HAS_GUC_CT.
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_ct.c static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) · line 434
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_ct.c +3
-3-* @guc: the guc -* return: 0 on success -* non-zero on failure +* +* Returns: +* 0 on success, a negative errno code on failure. Should be
* Return: 0 on sucess ...
hmm, I'm not so sure:
$ grep -r "\* Return: .*" drivers/gpu/drm/* | wc -l 153
$ grep -r "\* Returns:$" drivers/gpu/drm/* | wc -l 344
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_ct.c static int intel_guc_send_ct(struct intel_guc *guc, const u32 *action, u32 len) · line 439
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_ct.c +2
-1*/ -int intel_guc_enable_ct (struct intel_guc *guc) +int intel_guc_ct_enable (struct intel_guc_ct *ct) { +struct intel_guc *guc =ct_to_guc (ct);struct drm_i915_private *dev_priv =guc_to_i915 (guc);change to *i915 as part of this patch itself? :) similar for disable.
sure
Quoted 2 lines
Otherwise LGTM
Reviewed-by Sagar Arun Kamble <[email protected]>
thanks
/m
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Michal Wajdeczko
Quoted 9 lines · Sagar Arun Kamble
Quoted 6 lines · Michal Wajdeczko
There is no need to mix parameter types in public CT functions as we can always accept
intel_guc_ct.Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>
<snip>
Quoted 15 lines
Quoted 12 lines
Quoted 4 lines
/**
- * Enable buffer based command transport
+ *intel_guc_ct_enable- Enable buffer based command transport.
+ * @ct: pointer to CT structQuoted 8 lines
+ *
* Shall only be called for platforms withHAS_GUC_CT.
- * @guc: the guc
- * return: 0 on success
- * non-zero on failure
+ *
+ * Returns:
+ * 0 on success, a negative errno code on failure.Quoted 2 lines
Should be
* Return: 0 on sucess ...
Quoted 8 lines
hmm, I'm not so sure:
$ grep -r "\* Return: .*" drivers/gpu/drm/* | wc -l 153$ grep -r "\* Returns:$" drivers/gpu/drm/* | wc -l 344
Hi Michal,
kernel-doc rules recommend "Return:".
Thanks,
Sagar
Quoted 16 lines
Quoted 7 lines
Quoted 6 lines
*/
drivers/gpu/drm/i915/intel_guc_ct.c +1
-1-int intel_guc_enable_ct (struct intel_guc *guc) +int intel_guc_ct_enable (struct intel_guc_ct *ct){
+ structintel_guc*guc =ct_to_guc(ct);
structdrm_i915_private*dev_priv=guc_to_i915(guc);change to *i915 as part of this patch itself? :) similar for disable.
sure
Quoted 2 lines
Otherwise LGTM
Reviewed-by Sagar Arun Kamble <[email protected]>thanks
/m
Signature · 7 lines
Thanks, Sagar _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 34 lines · Sagar Arun Kamble
Quoted 12 lines · Michal Wajdeczko
Quoted 9 lines · Sagar Arun Kamble
Quoted 6 lines · Michal Wajdeczko
There is no need to mix parameter types in public CT functions as we can always accept
intel_guc_ct.Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]><snip>
Quoted 20 lines
Quoted 12 lines
Quoted 4 lines
/**
- * Enable buffer based command transport
+ *intel_guc_ct_enable- Enable buffer based command transport.
+ * @ct: pointer to CT structQuoted 8 lines
+ *
* Shall only be called for platforms withHAS_GUC_CT.
- * @guc: the guc
- * return: 0 on success
- * non-zero on failure
+ *
+ * Returns:
+ * 0 on success, a negative errno code on failure.Quoted 2 lines
Should be
* Return: 0 on sucess ...hmm, I'm not so sure:
$ grep -r "\* Return: .*" drivers/gpu/drm/* | wc -l 153
Quoted 6 lines
Quoted 3 lines
$ grep -r "\* Returns:$" drivers/gpu/drm/* | wc -l 344Hi Michal,
kernel-doc rules recommend "Return:".
Correct. For legacy reasons, a bunch of variants are recognized and canonicalized to "Return" in the output. I also recommend documenting the return values immediately following "Return: ", without \n, similar to the parameter documentation.
BR,
Jani.
Quoted 19 lines
Thanks,
SagarQuoted 16 lines
Quoted 7 lines
Quoted 6 lines
*/
drivers/gpu/drm/i915/intel_guc_ct.c +1
-1-int intel_guc_enable_ct (struct intel_guc *guc) +int intel_guc_ct_enable (struct intel_guc_ct *ct){
+ structintel_guc*guc =ct_to_guc(ct);
structdrm_i915_private*dev_priv=guc_to_i915(guc);change to *i915 as part of this patch itself? :) similar for disable.
sure
Quoted 2 lines
Otherwise LGTM
Reviewed-by Sagar Arun Kamble <[email protected]>thanks
/m
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx