drm/i915/guc: Use consistent name for scratch register count
Subsystems (2)
PATCH 1/1 drm/i915/guc: Use consistent name for scratch register count
We should be consistent on naming of similar definitions.
--- drivers/gpu/drm/i915/intel_guc_fw.c | 4 ++-- drivers/gpu/drm/i915/intel_guc_reg.h | 3 ++- drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +2 -2
@@ -130,14 +130,14 @@ static int guc_xfer_rsa(struct intel_guc *guc, struct i915_vma *vma)struct drm_i915_private *dev_priv =guc_to_i915 (guc);struct intel_uc_fw *guc_fw = &guc->fw;struct sg_table *sg = vma->pages; -u32 rsa[UOS_RSA_SCRATCH_MAX_COUNT ]; +u32 rsa[UOS_RSA_SCRATCH_COUNT ];int i;if (sg_pcopy_to_buffer (sg->sgl, sg->nents, rsa,sizeof (rsa), guc_fw->rsa_offset) !=sizeof (rsa))return -EINVAL ; -for (i =0 ; i <UOS_RSA_SCRATCH_MAX_COUNT ; i++) +for (i =0 ; i <UOS_RSA_SCRATCH_COUNT ; i++)I915_WRITE (UOS_RSA_SCRATCH (i), rsa[i]);return 0 ;
drivers/gpu/drm/i915/intel_guc_reg.h +2 -1
@@ -52,7 +52,8 @@#define SOFT_SCRATCH_COUNT 16#define UOS_RSA_SCRATCH (i) _MMIO(0xc200 + (i) * 4) -#define UOS_RSA_SCRATCH_MAX_COUNT 64 +#define UOS_RSA_SCRATCH_COUNT 64 +#define DMA_ADDR_0_LOW _MMIO(0xc300)#define DMA_ADDR_0_HIGH _MMIO(0xc304)#define DMA_ADDR_1_LOW _MMIO(0xc308)
drivers/gpu/drm/i915/intel_uc_fw.c +1 -1
@@ -105,7 +105,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, }/* now RSA */ -if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) { +if (css->key_size_dw !=UOS_RSA_SCRATCH_COUNT ) {DRM_WARN ("%s: Mismatched firmware RSA key size (%u)\n" ,intel_uc_fw_type_repr (uc_fw->type), css->key_size_dw); err = -ENOEXEC ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/guc: Use consistent name for scratch register count
== Series Details ==
== Series Details ==
Series: drm/i915/guc: Use consistent name for scratch register count
URL : https://patchwork.freedesktop.org/series/34369/
State : success
== Summary ==
Series 34369v1 drm/i915/guc: Use consistent name for scratch register count
https://patchwork.freedesktop.org/api/1.0/series/34369/revisions/1/mbox/
Test kms_busy:
Subgroup basic-flip-a:
pass -> FAIL (fi-gdg-551) fdo#102654fdo#102654 https://bugs.freedesktop.org/show_bug.cgi?id=102654
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:445s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:453s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:543s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:276s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:502s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:509s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:498s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:498s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:425s fi-gdg-551 total:289 pass:177 dwarn:1 dfail:0 fail:2 skip:109 time:266s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:538s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:429s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:438s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:425s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:484s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:461s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:483s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:531s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:474s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:533s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:576s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:537s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:567s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:516s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:500s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:463s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:566s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:423s Blacklisted hosts: fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:608s fi-glk-dsi total:289 pass:169 dwarn:0 dfail:10 fail:2 skip:108 time:438s
fi-cnl-y failed to connect after reboot
2cc63d7f56b7d8c9287a431773b3fec01b53e5cb drm-tip: 2017y-11m-24d-16h-04m-11s UTC integration manifest a3469c641b6c drm/i915/guc: Use consistent name for scratch register count
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7284/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915/guc: Use consistent name for scratch register count
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915/guc: Use consistent name for scratch register count
URL : https://patchwork.freedesktop.org/series/34369/
State : warning
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
pass -> FAIL (shard-snb) fdo#101623 +1
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test kms_chv_cursor_fail:
Subgroup pipe-c-256x256-top-edge:
pass -> SKIP (shard-hsw)fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2667 pass:1534 dwarn:1 dfail:0 fail:10 skip:1122 time:9489s shard-snb total:2667 pass:1311 dwarn:1 dfail:0 fail:13 skip:1342 time:8062s
Blacklisted hosts:
shard-apl total:2667 pass:1689 dwarn:2 dfail:0 fail:22 skip:954 time:13340s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7284/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michal Wajdeczko (2017-11-24 17:02:39)
Quoted 6 lines
We should be consistent on naming of similar definitions.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Sagar Arun Kamble <[email protected]>
Indeed, SOFT_SCRATCH_COUNT being the nearby example
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx