drm/i915: Introduce INTEL_GEN_MASK
Subsystems (3)
Joonas Lahtinen
maintainerPATCH v2 1/2 drm/i915: Introduce INTEL_GEN_MASK
Split INTEL_GEN_MASK out of IS_GEN macro, and make it usable within static declarations (unlike combound statements).
--- drivers/gpu/drm/i915/i915_drv.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +10 -12
@@ -2873,23 +2873,21 @@ intel_info(const struct drm_i915_private *dev_priv)#define INTEL_REVID (dev_priv) ((dev_priv)->drm.pdev->revision)#define GEN_FOREVER (0) + +#define INTEL_GEN_MASK (s, e) ( \ + BUILD_BUG_ON_ZERO(!__builtin_constant_p(s)) + \ + BUILD_BUG_ON_ZERO(!__builtin_constant_p(e)) + \ + GENMASK((e) != GEN_FOREVER ? (e) - 1 : BITS_PER_LONG - 1, \ + (s) != GEN_FOREVER ? (s) - 1 : 0) \ +) +/* * Returns true if Gen is in inclusive range [Start, End]. * * Use GEN_FOREVER for unbound start and or end. */ -#define IS_GEN (dev_priv, s, e) ({ \ - unsigned int __s = (s), __e = (e); \ - BUILD_BUG_ON(!__builtin_constant_p(s)); \ - BUILD_BUG_ON(!__builtin_constant_p(e)); \ - if ((__s) != GEN_FOREVER) \ - __s = (s) - 1; \ - if ((__e) == GEN_FOREVER) \ - __e = BITS_PER_LONG - 1; \ - else \ - __e = (e) - 1; \ - !!((dev_priv)->info.gen_mask & GENMASK((__e), (__s))); \ -}) +#define IS_GEN (dev_priv, s, e) \ + (!!((dev_priv)->info.gen_mask & INTEL_GEN_MASK((s), (e))))/* * Return true if revision is in range [since,until] inclusive.
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH v2 2/2 drm/i915: Simplify i915_reg_read_ioctl
Convert to use the freshly available made INTEL_GEN_MASK for easier grepping and improve function readability and clarify the UABI documentation.
No functional changes.
v2:
- Lift GEM_BUG_ONs and use is_power_of_2 (Chris)
- Retain -EINVAL on bad flags behavior (Chris)
--- drivers/gpu/drm/i915/intel_uncore.c | 81 ++++++++++++++++++------------------- include/uapi/drm/i915_drm.h | 6 ++- 2 files changed, 44 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +40 -41
@@ -1292,72 +1292,71 @@ void intel_uncore_fini(struct drm_i915_private *dev_priv)intel_uncore_forcewake_reset (dev_priv, false); } -#define GEN_RANGE (l, h) GENMASK((h) - 1, (l) - 1) - -static const struct register_whitelist { -i915_reg_t offset_ldw, offset_udw; -uint32_t size; -/* supported gens, 0x10 for 4, 0x30 for 4 and 5, etc. */ -uint32_t gen_bitmask; -} whitelist[] = { - { .offset_ldw =RING_TIMESTAMP (RENDER_RING_BASE ), - .offset_udw =RING_TIMESTAMP_UDW (RENDER_RING_BASE ), - .size =8 , .gen_bitmask =GEN_RANGE (4 ,10 ) }, -}; +static const struct reg_whitelist { +i915_reg_t offset_ldw; +i915_reg_t offset_udw; +unsigned long gen_mask; +u8 size; +} reg_read_whitelist[] = {{ + .offset_ldw =RING_TIMESTAMP (RENDER_RING_BASE ), + .offset_udw =RING_TIMESTAMP_UDW (RENDER_RING_BASE ), + .gen_mask =INTEL_GEN_MASK (4 ,10 ), + .size =8 +}};int i915_reg_read_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_reg_read *reg = data; -struct register_whitelist const *entry = whitelist; -unsigned size; -i915_reg_t offset_ldw, offset_udw; -int i, ret =0 ; - -for (i =0 ; i <ARRAY_SIZE (whitelist); i++, entry++) { -if (i915_mmio_reg_offset (entry->offset_ldw) == (reg->offset & -entry->size) && - (INTEL_INFO (dev_priv)->gen_mask & entry->gen_bitmask)) +struct reg_whitelist const *entry; +unsigned flags; +int remain; +int ret =0 ; + + entry = reg_read_whitelist; + remain =ARRAY_SIZE (reg_read_whitelist); +while (remain) { +if (INTEL_INFO (dev_priv)->gen_mask & entry->gen_mask && +i915_mmio_reg_offset (entry->offset_ldw) == + (reg->offset & -entry->size))break ; + entry++; + remain--; } -if (i ==ARRAY_SIZE (whitelist)) +if (!remain)return -EINVAL ; -/* We use the low bits to encode extra flags as the register should -* be naturally aligned (and those that are not so aligned merely -* limit the available flags for that register). -*/ - offset_ldw = entry->offset_ldw; - offset_udw = entry->offset_udw; - size = entry->size; - size |= reg->offset ^i915_mmio_reg_offset (offset_ldw); +GEM_BUG_ON (hweight8 (entry->size) !=1 ); +GEM_BUG_ON (entry->size >8 ); -intel_runtime_pm_get (dev_priv); + flags = reg->offset & ~i915_mmio_reg_offset (entry->offset_ldw); -switch (size) { -case 8 |1 : - reg->val =I915_READ64_2x32 (offset_ldw, offset_udw); -break ; +intel_runtime_pm_get (dev_priv); +switch (entry->size) {case 8 : - reg->val =I915_READ64 (offset_ldw); +if (flags &I915_REG_READ_8B_WA ) + reg->val =I915_READ64_2x32 (entry->offset_ldw, + entry->offset_udw); +else + reg->val =I915_READ64 (entry->offset_ldw);break ;case 4 : - reg->val =I915_READ (offset_ldw); + reg->val =I915_READ (entry->offset_ldw);break ;case 2 : - reg->val =I915_READ16 (offset_ldw); + reg->val =I915_READ16 (entry->offset_ldw);break ;case 1 : - reg->val =I915_READ8 (offset_ldw); + reg->val =I915_READ8 (entry->offset_ldw);break ;default : ret = -EINVAL ; - goto out; +break ; } - -out:intel_runtime_pm_put (dev_priv); +return ret; }
include/uapi/drm/i915_drm.h +4 -2
@@ -1308,14 +1308,16 @@ struct drm_i915_reg_read {* be specified */ __u64 offset; +#define I915_REG_READ_8B_WA BIT(0) +__u64 val;/* Return value */ };/* Known registers: * * Render engine timestamp - 0x2358 + 64bit - gen7+ * - Note this register returns an invalid value if using the default -* single instruction 8byte read, in order to workaround that use -* offset (0x2538 | 1) instead. +* single instruction 8byte read, in order to workaround that pass +* flag I915_REG_READ_8B_WA in offset field. * */
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915: Simplify i915_reg_read_ioctl
Quoting Joonas Lahtinen (2017-09-08 12:49:06)
Quoted 9 lines
Convert to use the freshly available made
INTEL_GEN_MASKfor easier grepping and improve function readability and clarify the UABI documentation.No functional changes.
v2:
- LiftGEM_BUG_ONsand useis_power_of_2(Chris)
- Retain-EINVALon bad flags behavior (Chris)
I think you missed git add.
-Chris
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v2 2/2] drm/i915: Simplify i915_reg_read_ioctl
Quoted 5 lines · Chris Wilson
Quoting Joonas Lahtinen (2017-09-08 12:49:06)
Quoted 4 lines
Convert to use the freshly available made
INTEL_GEN_MASKfor easier grepping and improve function readability and clarify the UABI documentation.
Quoted 7 lines
Quoted 5 lines
No functional changes.
v2:
- LiftGEM_BUG_ONsand useis_power_of_2(Chris)
- Retain-EINVALon bad flags behavior (Chris)I think you missed git add.
Oh well, should not try to submit patches on Friday (or Monday for that matter). Just did the git add and sent with -3 instead of -v3... But the correct version is en route, too.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915: Introduce INTEL_GEN_MASK
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Introduce INTEL_GEN_MASK
URL : https://patchwork.freedesktop.org/series/30012/
State : success
== Summary ==
Series 30012v1 series starting with [v2,1/2] drm/i915: Introduce INTEL_GEN_MASK
https://patchwork.freedesktop.org/api/1.0/series/30012/revisions/1/mbox/
Test kms_flip:
Subgroup basic-flip-vs-modeset:
pass -> SKIP (fi-skl-x1585l) fdo#101781fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:447s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:369s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:566s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:257s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:528s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:528s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:528s fi-cfl-s total:289 pass:250 dwarn:4 dfail:0 fail:0 skip:35 time:484s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:443s fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:606s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:448s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:428s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:430s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:509s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:477s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:510s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:600s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:599s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:528s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:468s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:541s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:525s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:449s fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:502s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:566s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:408s
16fef66706a3fcdd1d87009beab7e09de1f32807 drm-tip: 2017y-09m-08d-08h-41m-49s UTC integration manifest 3f664d10f8dd drm/i915: Simplify i915_reg_read_ioctlf738c88b96bf drm/i915: Introduce INTEL_GEN_MASK
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5617/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v2,1/2] drm/i915: Introduce INTEL_GEN_MASK
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Introduce INTEL_GEN_MASK
URL : https://patchwork.freedesktop.org/series/30012/
State : success
== Summary ==
Test kms_flip:
Subgroup wf_vblank-ts-check-interruptible:
fail -> PASS (shard-hsw) fdo#100368fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
shard-hsw total:2302 pass:1239 dwarn:0 dfail:0 fail:11 skip:1052 time:9547s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5617/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx