drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
Subsystems (2)
PATCH v2 1/2 drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
Prefer INTEL_GEN() over INTEL_INFO()->gen except in special circumstances.
v2: don't change device info dump (Chris)
--- drivers/gpu/drm/i915/intel_device_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -809,7 +809,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)gen9_sseu_info_init (dev_priv); else if (INTEL_GEN(dev_priv) == 10) gen10_sseu_info_init(dev_priv); - else if (INTEL_INFO(dev_priv)->gen >= 11) + else if (INTEL_GEN(dev_priv) >= 11) gen11_sseu_info_init(dev_priv);/* Initialize command stream timestamp frequency */
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915: hint gen and gen_mask shouldn't be used directly
Prefix gen and gen_mask in struct intel_device_info with underscores to hint that they should not be used directly, except in special circumstances.
v2: Rebase
--- drivers/gpu/drm/i915/i915_drv.c | 5 +++-- drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++++------------ drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 6 ++++-- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 6 files changed, 22 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -2
@@ -907,7 +907,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,BUILD_BUG_ON (INTEL_MAX_PLATFORMS >sizeof (device_info->platform_mask) *BITS_PER_BYTE ); -BUG_ON (device_info->gen >sizeof (device_info->gen_mask) *BITS_PER_BYTE ); +BUG_ON (device_info->__gen > +sizeof (device_info->__gen_mask) *BITS_PER_BYTE );spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);mutex_init (&dev_priv->backlight_lock);
@@ -1339,7 +1340,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;/* Enable nuclear pageflip on ILK+ */ -if (!i915_modparams.nuclear_pageflip && match_info->gen <5 ) +if (!i915_modparams.nuclear_pageflip && match_info->__gen <5 ) driver.driver_features &= ~DRIVER_ATOMIC ; ret = -ENOMEM ;
drivers/gpu/drm/i915/i915_drv.h +12 -12
@@ -2294,7 +2294,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define INTEL_INFO (dev_priv) intel_info((dev_priv)) -#define INTEL_GEN (dev_priv) ((dev_priv)->info.gen) +#define INTEL_GEN (dev_priv) ((dev_priv)->info.__gen)#define INTEL_DEVID (dev_priv) ((dev_priv)->info.device_id)#define REVID_FOREVER 0xff
@@ -2315,7 +2315,7 @@ intel_info(const struct drm_i915_private *dev_priv)* Use GEN_FOREVER for unbound start and or end. */ #define IS_GEN (dev_priv, s, e) \ - (!!((dev_priv)->info.gen_mask & INTEL_GEN_MASK((s), (e)))) + (!!((dev_priv)->info.__gen_mask & INTEL_GEN_MASK((s), (e))))/* * Return true if revision is in range [since,until] inclusive.
@@ -2463,16 +2463,16 @@ intel_info(const struct drm_i915_private *dev_priv)* have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular * chips, etc.). */ -#define IS_GEN2 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(1))) -#define IS_GEN3 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(2))) -#define IS_GEN4 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(3))) -#define IS_GEN5 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(4))) -#define IS_GEN6 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(5))) -#define IS_GEN7 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(6))) -#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7))) -#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8))) -#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9))) -#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10))) +#define IS_GEN2 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(1))) +#define IS_GEN3 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(2))) +#define IS_GEN4 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(3))) +#define IS_GEN5 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(4))) +#define IS_GEN6 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(5))) +#define IS_GEN7 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(6))) +#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(7))) +#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(8))) +#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(9))) +#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(10)))#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -30,7 +30,7 @@#include "i915_selftest.h" #define PLATFORM (x) .platform = (x), .platform_mask = BIT(x) -#define GEN (x) .gen = (x), .gen_mask = BIT((x) - 1) +#define GEN (x) .__gen = (x), .__gen_mask = BIT((x) - 1)#define GEN_DEFAULT_PIPEOFFSETS \ .pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, \
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -119,7 +119,7 @@ void intel_device_info_dump(const struct intel_device_info *info,INTEL_DEVID (dev_priv),INTEL_REVID (dev_priv),intel_platform_name (info->platform), - info->gen); + info->__gen);intel_device_info_dump_flags (info, p); }
drivers/gpu/drm/i915/intel_device_info.h +4 -2
@@ -144,9 +144,11 @@ typedef u8 intel_ring_mask_t;struct intel_device_info {u16 device_id; -u16 gen_mask; -u8 gen; +/* Prefer INTEL_GEN() and IS_GENx() over accessing these. */ +u16 __gen_mask; +u8 __gen; +u8 gt;/* GT number, 0 if undefined */ u8 num_rings;intel_ring_mask_t ring_mask;/* Rings supported by the HW */
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -1664,7 +1664,7 @@ int i915_reg_read_ioctl(struct drm_device *dev,GEM_BUG_ON (entry->size >8 );GEM_BUG_ON (entry_offset & (entry->size -1 )); -if (INTEL_INFO (dev_priv)->gen_mask & entry->gen_mask && +if (INTEL_INFO (dev_priv)->__gen_mask & entry->gen_mask && entry_offset == (reg->offset & -entry->size))break ; entry++;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly
Quoted 3 lines · Jani Nikula
Prefix gen and
gen_maskin structintel_device_infowith underscores to hint that they should not be used directly, except in special circumstances.
I started writing the same patch yesterday and then gave up, being unsure if underscore would prevent someone slipping in this anyway. But I guess it doesn't harm, so:
Quoted 73 lines
v2: Rebase
Cc Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 5 +++-- drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++++------------ drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 6 ++++-- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 6 files changed, 22 insertions(+), 19 deletions(-)drivers/gpu/drm/i915/i915_drv.c +3
-2@@ -907,7 +907,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,BUILD_BUG_ON (INTEL_MAX_PLATFORMS >sizeof (device_info->platform_mask) *BITS_PER_BYTE ); -BUG_ON (device_info->gen >sizeof (device_info->gen_mask) *BITS_PER_BYTE ); +BUG_ON (device_info->__gen > +sizeof (device_info->__gen_mask) *BITS_PER_BYTE );spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);mutex_init (&dev_priv->backlight_lock);@@ -1339,7 +1340,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;/* Enable nuclear pageflip on ILK+ */ -if (!i915_modparams.nuclear_pageflip && match_info->gen <5 ) +if (!i915_modparams.nuclear_pageflip && match_info->__gen <5 ) driver.driver_features &= ~DRIVER_ATOMIC ; ret = -ENOMEM ;drivers/gpu/drm/i915/i915_drv.h +2
-12@@ -2294,7 +2294,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define INTEL_INFO (dev_priv) intel_info((dev_priv)) -#define INTEL_GEN (dev_priv) ((dev_priv)->info.gen) +#define INTEL_GEN (dev_priv) ((dev_priv)->info.__gen)#define INTEL_DEVID (dev_priv) ((dev_priv)->info.device_id)#define REVID_FOREVER 0xff@@ -2315,7 +2315,7 @@ intel_info(const struct drm_i915_private *dev_priv)* Use GEN_FOREVER for unbound start and or end. */ #define IS_GEN (dev_priv, s, e) \ - (!!((dev_priv)->info.gen_mask & INTEL_GEN_MASK((s), (e)))) + (!!((dev_priv)->info.__gen_mask & INTEL_GEN_MASK((s), (e))))/* * Return true if revision is in range [since,until] inclusive. @@ -2463,16 +2463,16 @@ intel_info(const struct drm_i915_private *dev_priv)* have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular * chips, etc.). */ -#define IS_GEN2 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(1))) -#define IS_GEN3 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(2))) -#define IS_GEN4 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(3))) -#define IS_GEN5 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(4))) -#define IS_GEN6 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(5))) -#define IS_GEN7 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(6))) -#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7))) -#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8))) -#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9))) -#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10)))
drivers/gpu/drm/i915/i915_drv.h intel_info(const struct drm_i915_private *dev_priv) · line 2475
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +10
-0+#define IS_GEN2 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(1))) +#define IS_GEN3 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(2))) +#define IS_GEN4 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(3))) +#define IS_GEN5 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(4))) +#define IS_GEN6 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(5))) +#define IS_GEN7 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(6))) +#define IS_GEN8 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(7))) +#define IS_GEN9 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(8))) +#define IS_GEN10 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(9))) +#define IS_GEN11 (dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(10)))
This block I wanted to tidy for a long time, well actually I various series I had a patch which adds IS_GENx(dev_priv, x) then used by all of them and so would shrink the patch here.
Quoted 53 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +1
-1@@ -30,7 +30,7 @@#include "i915_selftest.h" #define PLATFORM (x) .platform = (x), .platform_mask = BIT(x) -#define GEN (x) .gen = (x), .gen_mask = BIT((x) - 1) +#define GEN (x) .__gen = (x), .__gen_mask = BIT((x) - 1)#define GEN_DEFAULT_PIPEOFFSETS \ .pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, \drivers/gpu/drm/i915/intel_device_info.c +1
-1@@ -119,7 +119,7 @@ void intel_device_info_dump(const struct intel_device_info *info,INTEL_DEVID (dev_priv),INTEL_REVID (dev_priv),intel_platform_name (info->platform), - info->gen); + info->__gen);intel_device_info_dump_flags (info, p); }drivers/gpu/drm/i915/intel_device_info.h +4
-2@@ -144,9 +144,11 @@ typedef u8 intel_ring_mask_t;struct intel_device_info {u16 device_id; -u16 gen_mask; -u8 gen; +/* Prefer INTEL_GEN() and IS_GENx() over accessing these. */ +u16 __gen_mask; +u8 __gen; +u8 gt;/* GT number, 0 if undefined */ u8 num_rings;intel_ring_mask_t ring_mask;/* Rings supported by the HW */ drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c int i915_reg_read_ioctl(struct drm_device *dev, · line 1670
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -1664,7 +1664,7 @@ int i915_reg_read_ioctl(struct drm_device *dev,GEM_BUG_ON (entry->size >8 );GEM_BUG_ON (entry_offset & (entry->size -1 )); -if (INTEL_INFO (dev_priv)->gen_mask & entry->gen_mask && +if (INTEL_INFO (dev_priv)->__gen_mask & entry->gen_mask && entry_offset == (reg->offset & -entry->size))break ; entry++;
I see you later realized you need to enable selftests and respin so I can review at that point. GVT as well perhaps?
Hmmm... idea for CI builder to quickly try a few Kconfig sets in the background, after testing has been kicked off?
Like selftest/gvt/i915_debug/i915_debug_gem? Would be a lot of combinations but maybe build machine is mostly idle compared to test hosts?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [v2,1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/40380/
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
DESCEND objtool
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/i915_gem.o
In file included from drivers/gpu/drm/i915/i915_gem.c:6001:0:
drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function ‘mock_gem_device’:
drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:27: error: ‘struct intel_device_info’ has no member named ‘gen’; did you mean ‘__gen’?
mkwrite_device_info(i915)->gen = -1;
^~scripts/Makefile.build:324: recipe for target 'drivers/gpu/drm/i915/i915_gem.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_gem.o] Error 1 scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:583: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1051: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for series starting with [v2,1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
Quoted 20 lines · Patchwork
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: prefer
INTEL_GEN()over INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/40380/
State : failure== Summary ==
CHK
include/config/kernel.releaseCHK 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 DESCEND objtool CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/i915_gem.o
Quoted 4 lines
In file included from
drivers/gpu/drm/i915/i915_gem.c:6001:0:drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function ‘mock_gem_device’:drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:27: error: ‘struct intel_device_info’ has no member named ‘gen’; did you mean ‘__gen’?
mkwrite_device_info(i915)->gen = -1;
Looks like someone(tm) has CONFIG_DRM_I915_SELFTEST=n in their dev repo. *blush*.
Quoted 12 lines
^~
scripts/Makefile.build:324: recipe for target 'drivers/gpu/drm/i915/i915_gem.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_gem.o] Error 1scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:583: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1051: recipe for target 'drivers' failed
make: *** [drivers] Error 2
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Jani Nikula
Prefer
INTEL_GEN()over INTEL_INFO()->gen except in special circumstances.v2: don't change device info dump (Chris)
Cc Tvrtko Ursulin <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_device_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_device_info.c +0
-0
drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 815
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c +1
-1@@ -809,7 +809,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)gen9_sseu_info_init (dev_priv); else if (INTEL_GEN(dev_priv) == 10) gen10_sseu_info_init(dev_priv); - else if (INTEL_INFO(dev_priv)->gen >= 11) + else if (INTEL_GEN(dev_priv) >= 11) gen11_sseu_info_init(dev_priv);/* Initialize command stream timestamp frequency */
I was waiting for directly involved parties to feel moral responsibility to send this followup. ;)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx