drm/i915: Fix sink crc connector iteration
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Fix sink crc connector iteration
Regressed by this commit:
commit 3455454e18ca3f92c565700539e744c620d8276b
Author: Ander Conselvan de Oliveira <[email protected]> Date: Tue Mar 3 15:21:56 2015 +0200
drm/i915: Add a for_each_intel_connector macro
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2305,7 +2305,7 @@ static int i915_sink_crc(struct seq_file *m, void *data)u8 crc[6 ];drm_modeset_lock_all (dev); -for_each_intel_encoder (dev, connector) { +for_each_intel_connector (dev, connector) {if (connector->base.dpms !=DRM_MODE_DPMS_ON )continue ;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 5950 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB -1 279/279 278/279 IVB 343/343 343/343 BYT 287/287 287/287 HSW 363/363 363/363 BDW 308/308 308/308
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt_gem_persistent_relocs_forked-interruptible PASS(2) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · Rodrigo Vivi
Regressed by this commit:
commit
3455454e18ca3f92c565700539e744c620d8276bAuthor: Ander Conselvan de Oliveira <[email protected]> Date: Tue Mar 3 15:21:56 2015 +0200drm/i915: Add a
for_each_intel_connectormacroCc Ander Conselvan de Oliveira <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_sink_crc(struct seq_file *m, void *data) · line 2311
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -2305,7 +2305,7 @@ static int i915_sink_crc(struct seq_file *m, void *data)u8 crc[6 ];drm_modeset_lock_all (dev); -for_each_intel_encoder (dev, connector) { +for_each_intel_connector (dev, connector) {if (connector->base.dpms !=DRM_MODE_DPMS_ON )continue ;
Yeah, oops.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Make for_each_intel_* macros typesafe
So that the compiler warns if we get something wrong.
--- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +26 -13
@@ -232,30 +232,43 @@ enum hpd_pin { (__s) <INTEL_INFO (__dev_priv)->num_sprites[(__p)]; \ (__s)++) -#define for_each_crtc (dev, crtc) \ +#define type_check (variable, type) \ + { \ + typeof(variable) __dummy_ptr = NULL; \ + const type *__type_check = __dummy_ptr; \ + (void) __type_check; \ + } + +#define for_each_crtc (dev, crtc) \ + type_check(crtc, struct drm_crtc) \ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) -#define for_each_intel_crtc (dev, intel_crtc) \ - list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) +#define for_each_intel_crtc (dev, crtc) \ + type_check(crtc, struct intel_crtc) \ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) -#define for_each_intel_encoder (dev, intel_encoder) \ - list_for_each_entry(intel_encoder, \ +#define for_each_intel_encoder (dev, encoder) \ + type_check(encoder, struct intel_encoder) \ + list_for_each_entry(encoder, \ &(dev)->mode_config.encoder_list, \ base.head) -#define for_each_intel_connector (dev, intel_connector) \ - list_for_each_entry(intel_connector, \ +#define for_each_intel_connector (dev, connector) \ + type_check(connector, struct intel_connector); \ + list_for_each_entry(connector, \ &dev->mode_config.connector_list, \ base.head) -#define for_each_encoder_on_crtc (dev, __crtc, intel_encoder) \ - list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ - if ((intel_encoder)->base.crtc == (__crtc)) +#define for_each_encoder_on_crtc (dev, __crtc, encoder) \ + type_check(encoder, struct intel_encoder) \ + list_for_each_entry((encoder), &(dev)->mode_config.encoder_list, base.head) \ + if ((encoder)->base.crtc == (__crtc)) -#define for_each_connector_on_encoder (dev, __encoder, intel_connector) \ - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \ - if ((intel_connector)->base.encoder == (__encoder)) +#define for_each_connector_on_encoder (dev, __encoder, connector) \ + type_check(connector, struct intel_connector) \ + list_for_each_entry((connector), &(dev)->mode_config.connector_list, base.head) \ + if ((connector)->base.encoder == (__encoder))#define for_each_power_domain (domain, mask) \ for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Make for_each_intel_* macros typesafe
Task id: 5954 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 268/268 268/268
ILK -1 303/303 302/303
SNB 283/283 283/283 IVB 342/342 342/342 BYT 287/287 287/287
HSW -1 363/363 362/363
BDW 308/308 308/308
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt_gem_fenced_exec_thrash_no-spare-fences-busy PASS(2) DMESG_WARN(1)PASS(1)
*HSW igt_gem_storedw_loop_vebox PASS(2) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH] drm/i915: Make for_each_intel_* macros typesafe
In reply to Ander Conselvan de OliveiraQuoted 16 lines · Ander Conselvan de Oliveira
So that the compiler warns if we get something wrong.
Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -232,30 +232,43 @@ enum hpd_pin { (__s) <INTEL_INFO (__dev_priv)->num_sprites[(__p)]; \ (__s)++) -#define for_each_crtc (dev, crtc) \
drivers/gpu/drm/i915/i915_drv.h enum hpd_pin { · line 244
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +9
-0+#define type_check (variable, type) \ + { \ + typeof(variable) __dummy_ptr = NULL; \ + const type *__type_check = __dummy_ptr; \ + (void) __type_check; \ + } + +#define for_each_crtc (dev, crtc) \ + type_check(crtc, struct drm_crtc) \ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
if (foo)
for_each_crtc(dev, crtc);
will do type_check if foo, but list_for_each_entry unconditionally.
I think this is too fragile.
I'm already pretty anxious about our loop macros with an if in them blowing up due to the dangling else:
if (foo)
list_for_each_encoder_on_crtc(dev, crtc, intel_encoder)
bar();
else
baz();where baz() gets called for each encoder *not* on crtc, instead of once for !foo.
BR,
Jani.
Quoted 49 lines
drivers/gpu/drm/i915/i915_drv.h +17
-12-#define for_each_intel_crtc (dev, intel_crtc) \ - list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) +#define for_each_intel_crtc (dev, crtc) \ + type_check(crtc, struct intel_crtc) \ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) -#define for_each_intel_encoder (dev, intel_encoder) \ - list_for_each_entry(intel_encoder, \ +#define for_each_intel_encoder (dev, encoder) \ + type_check(encoder, struct intel_encoder) \ + list_for_each_entry(encoder, \ &(dev)->mode_config.encoder_list, \ base.head) -#define for_each_intel_connector (dev, intel_connector) \ - list_for_each_entry(intel_connector, \ +#define for_each_intel_connector (dev, connector) \ + type_check(connector, struct intel_connector); \ + list_for_each_entry(connector, \ &dev->mode_config.connector_list, \ base.head) -#define for_each_encoder_on_crtc (dev, __crtc, intel_encoder) \ - list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ - if ((intel_encoder)->base.crtc == (__crtc)) +#define for_each_encoder_on_crtc (dev, __crtc, encoder) \ + type_check(encoder, struct intel_encoder) \ + list_for_each_entry((encoder), &(dev)->mode_config.encoder_list, base.head) \ + if ((encoder)->base.crtc == (__crtc)) -#define for_each_connector_on_encoder (dev, __encoder, intel_connector) \ - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \ - if ((intel_connector)->base.encoder == (__encoder)) +#define for_each_connector_on_encoder (dev, __encoder, connector) \ + type_check(connector, struct intel_connector) \ + list_for_each_entry((connector), &(dev)->mode_config.connector_list, base.head) \ + if ((connector)->base.encoder == (__encoder))#define for_each_power_domain (domain, mask) \ for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Make for_each_intel_* macros typesafe
Quoted 16 lines · Jani Nikula
Quoted 15 lines · Ander Conselvan de Oliveira
So that the compiler warns if we get something wrong.
Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -232,30 +232,43 @@ enum hpd_pin { (__s) <INTEL_INFO (__dev_priv)->num_sprites[(__p)]; \ (__s)++)
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h enum hpd_pin { · line 244
Quoted 11 lines
drivers/gpu/drm/i915/i915_drv.h +9
-1-#define for_each_crtc (dev, crtc) \ +#define type_check (variable, type) \ + { \ + typeof(variable) __dummy_ptr = NULL; \ + const type *__type_check = __dummy_ptr; \ + (void) __type_check; \ + } + +#define for_each_crtc (dev, crtc) \ + type_check(crtc, struct drm_crtc) \ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
#define __list_for_each_entry_type(pos, head, type, member) \ for (pos = list_first_entry(head, type, member); \ &pos->member != (head); \ pos = list_next_entry(pos, member))
#define for_each_crtc(dev, crtc) \ __list_for_each_entry_type(crtc, \ &dev->mode_config.crtc_list, \ struct drm_crtc, \ head)
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Make for_each_intel_* macros typesafe
So that the compiler warns if we get something wrong.
v2: Don't break 'if (foo) for_each_*' usage. (Jani & Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 63 ++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +40 -23
@@ -232,30 +232,47 @@ enum hpd_pin { (__s) <INTEL_INFO (__dev_priv)->num_sprites[(__p)]; \ (__s)++) -#define for_each_crtc (dev, crtc) \ - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) - -#define for_each_intel_crtc (dev, intel_crtc) \ - list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) - -#define for_each_intel_encoder (dev, intel_encoder) \ - list_for_each_entry(intel_encoder, \ - &(dev)->mode_config.encoder_list, \ - base.head) - -#define for_each_intel_connector (dev, intel_connector) \ - list_for_each_entry(intel_connector, \ - &dev->mode_config.connector_list, \ - base.head) +#define __list_for_each_entry_type (pos, head, type, member) \ + for (pos = list_first_entry(head, type, member); \ + &pos->member != (head); \ + pos = list_next_entry(pos, member)) - -#define for_each_encoder_on_crtc (dev, __crtc, intel_encoder) \ - list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ - if ((intel_encoder)->base.crtc == (__crtc)) - -#define for_each_connector_on_encoder (dev, __encoder, intel_connector) \ - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \ - if ((intel_connector)->base.encoder == (__encoder)) +#define for_each_crtc (dev, crtc) \ + __list_for_each_entry_type(crtc, \ + &dev->mode_config.crtc_list, \ + struct drm_crtc, \ + head) + +#define for_each_intel_crtc (dev, crtc) \ + __list_for_each_entry_type(crtc, \ + &dev->mode_config.crtc_list, \ + struct intel_crtc, base.head) + +#define for_each_intel_encoder (dev, encoder) \ + __list_for_each_entry_type(encoder, \ + &(dev)->mode_config.encoder_list, \ + struct intel_encoder, \ + base.head) + +#define for_each_intel_connector (dev, connector) \ + __list_for_each_entry_type(connector, \ + &dev->mode_config.connector_list, \ + struct intel_connector, \ + base.head) + + +#define for_each_encoder_on_crtc (dev, __crtc, encoder) \ + __list_for_each_entry_type((encoder), \ + &(dev)->mode_config.encoder_list,\ + struct intel_encoder, base.head) \ + if ((encoder)->base.crtc == (__crtc)) + +#define for_each_connector_on_encoder (dev, __encoder, connector) \ + __list_for_each_entry_type((connector), \ + &(dev)->mode_config.connector_list, \ + struct intel_connector, \ + base.head) \ + if ((connector)->base.encoder == (__encoder))#define for_each_power_domain (domain, mask) \ for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Make for_each_intel_* macros typesafe
Task id: 5958 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 275/275 273/275 ILK -23 303/303 280/303 SNB -2 279/279 277/279 IVB -2 343/343 341/343 BYT -2 287/287 285/287 HSW -1 361/361 360/361 BDW -2 308/308 306/308 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt_drv_debugfs_reader PASS(2) DMESG_WARN(2) *PNV igt_drv_hangman_error-state-sysfs-entry PASS(2) TIMEOUT(2) *ILK igt_drv_debugfs_reader PASS(1) DMESG_WARN(1) *ILK igt_drv_hangman_error-state-sysfs-entry PASS(1) TIMEOUT(1) *ILK igt_drv_suspend_debugfs-reader PASS(1) DMESG_WARN(1) *ILK igt_gem_partial_pwrite_pread_write-snoop PASS(1) INIT(1) *ILK igt_gem_partial_pwrite_pread_write-uncached PASS(1) INIT(1) *ILK igt_gem_pwrite_pread_display-pwrite-blt-gtt_mmap-performance PASS(1) INIT(1) *ILK igt_gem_pwrite_pread_uncached-pwrite-blt-gtt_mmap-performance PASS(1) INIT(1) *ILK igt_gem_ringfill_blitter PASS(1) INIT(1) *ILK igt_gem_ringfill_blitter-interruptible PASS(1) INIT(1) *ILK igt_gem_tiled_pread_pwrite PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-sync-mempressure-interruptible PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-sync-mempressure-normal PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-sync-multifd-mempressure-interruptible PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-sync-multifd-mempressure-normal PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-unsync-mempressure-interruptible PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-unsync-mempressure-normal PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-unsync-multifd-mempressure-interruptible PASS(1) INIT(1) *ILK igt_gem_userptr_blits_forked-unsync-multifd-mempressure-normal PASS(1) INIT(1) *ILK igt_kms_flip_flip-vs-dpms-interruptible PASS(1) INIT(1) *ILK igt_kms_flip_flip-vs-rmfb-interruptible PASS(1) INIT(1) *ILK igt_kms_flip_rcs-wf_vblank-vs-dpms-interruptible PASS(1) INIT(1) *ILK igt_kms_flip_vblank-vs-hang PASS(1) INIT(1) *ILK igt_kms_flip_wf_vblank-vs-modeset-interruptible PASS(1) NO_RESULT(1) *SNB igt_drv_debugfs_reader PASS(2) DMESG_WARN(2) *SNB igt_drv_hangman_error-state-sysfs-entry PASS(2) TIMEOUT(2) *IVB igt_drv_debugfs_reader PASS(2) DMESG_WARN(2) *IVB igt_drv_hangman_error-state-sysfs-entry PASS(2) TIMEOUT(2) *BYT igt_drv_debugfs_reader PASS(2) DMESG_WARN(2) *BYT igt_gem_bad_length PASS(2) TIMEOUT(2) *HSW igt_pm_rpm_debugfs-read PASS(2) TIMEOUT(2) *BDW igt_drv_debugfs_reader PASS(2) DMESG_WARN(2) *BDW igt_drv_hangman_error-state-sysfs-entry PASS(2) TIMEOUT(2)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx