drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
Subsystems (2)
RFC 1/3 drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
We should not add trailing ; after each member allow other than statements-style uses of this helper macro. While here s/func/param for clarity.
--- drivers/gpu/drm/i915/i915_params.h | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_params.h +42 -42
@@ -27,50 +27,50 @@#include <linux/cache.h> /* for __read_mostly */ -#define I915_PARAMS_FOR_EACH (func) \ - func(char *, vbt_firmware); \ - func(int, modeset); \ - func(int, panel_ignore_lid); \ - func(int, semaphores); \ - func(int, lvds_channel_mode); \ - func(int, panel_use_ssc); \ - func(int, vbt_sdvo_panel_type); \ - func(int, enable_rc6); \ - func(int, enable_dc); \ - func(int, enable_fbc); \ - func(int, enable_ppgtt); \ - func(int, enable_execlists); \ - func(int, enable_psr); \ - func(int, disable_power_well); \ - func(int, enable_ips); \ - func(int, invert_brightness); \ - func(int, enable_guc_loading); \ - func(int, enable_guc_submission); \ - func(int, guc_log_level); \ - func(char *, guc_firmware_path); \ - func(char *, huc_firmware_path); \ - func(int, use_mmio_flip); \ - func(int, mmio_debug); \ - func(int, edp_vswing); \ - func(int, reset); \ - func(unsigned int, inject_load_failure); \ +#define I915_PARAMS_FOR_EACH (param) \ + param(char *, vbt_firmware) \ + param(int, modeset) \ + param(int, panel_ignore_lid) \ + param(int, semaphores) \ + param(int, lvds_channel_mode) \ + param(int, panel_use_ssc) \ + param(int, vbt_sdvo_panel_type) \ + param(int, enable_rc6) \ + param(int, enable_dc) \ + param(int, enable_fbc) \ + param(int, enable_ppgtt) \ + param(int, enable_execlists) \ + param(int, enable_psr) \ + param(int, disable_power_well) \ + param(int, enable_ips) \ + param(int, invert_brightness) \ + param(int, enable_guc_loading) \ + param(int, enable_guc_submission) \ + param(int, guc_log_level) \ + param(char *, guc_firmware_path) \ + param(char *, huc_firmware_path) \ + param(int, use_mmio_flip) \ + param(int, mmio_debug) \ + param(int, edp_vswing) \ + param(int, reset) \ + param(unsigned int, inject_load_failure) \/* leave bools at the end to not create holes */ \ -func (bool, alpha_support); \ -func (bool, enable_cmd_parser); \ -func (bool, enable_hangcheck); \ -func (bool, fastboot); \ -func (bool, prefault_disable); \ -func (bool, load_detect_test); \ -func (bool, force_reset_modeset_test); \ -func (bool, error_capture); \ -func (bool, disable_display); \ -func (bool, verbose_state_checks); \ -func (bool, nuclear_pageflip); \ -func (bool, enable_dp_mst); \ -func (bool, enable_dpcd_backlight); \ - func(bool, enable_gvt) + param(bool, alpha_support) \ + param(bool, enable_cmd_parser) \ + param(bool, enable_hangcheck) \ + param(bool, fastboot) \ + param(bool, prefault_disable) \ + param(bool, load_detect_test) \ + param(bool, force_reset_modeset_test) \ + param(bool, error_capture) \ + param(bool, disable_display) \ + param(bool, verbose_state_checks) \ + param(bool, nuclear_pageflip) \ + param(bool, enable_dp_mst) \ + param(bool, enable_dpcd_backlight) \ + param(bool, enable_gvt) -#define MEMBER (T , member) T member +#define MEMBER (T , member) T member;struct i915_params {I915_PARAMS_FOR_EACH (MEMBER); };
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/3 drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +-- drivers/gpu/drm/i915/i915_params.c | 42 ++---------------- drivers/gpu/drm/i915/i915_params.h | 82 +++++++++++++++++------------------ 4 files changed, 48 insertions(+), 84 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -67,7 +67,7 @@ static int i915_capabilities(struct seq_file *m, void *data)#undef PRINT_FLAGkernel_param_lock (THIS_MODULE ); -#define PRINT_PARAM (T , x) seq_print_param(m, #x, #T, &i915_modparams.x); +#define PRINT_PARAM (T , x, ...) seq_print_param(m, #x, #T, &i915_modparams.x);I915_PARAMS_FOR_EACH (PRINT_PARAM );#undef PRINT_PARAMkernel_param_unlock (THIS_MODULE );
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -567,7 +567,7 @@ static __always_inline void err_print_param(struct drm_i915_error_state_buf *m,static void err_print_params (struct drm_i915_error_state_buf *m,const struct i915_params *p) { -#define T , x) err_print_param(m, #x, #T, &p->x); +#define T , x, ...) err_print_param(m, #x, #T, &p->x);I915_PARAMS_FOR_EACH (#undef PRINT }
@@ -861,7 +861,7 @@ void __i915_gpu_state_free(struct kref *error_ref)kfree (error->overlay);kfree (error->display); -#define FREE (T , x) free_param(#T, &error->params.x); +#define FREE (T , x, ...) free_param(#T, &error->params.x);I915_PARAMS_FOR_EACH (FREE );#undef FREE
@@ -1697,7 +1697,7 @@ static int capture(void *data) error->i915->gt.last_init_time)); error->params = i915_modparams; -#define DUP (T , x) dup_param(#T, &error->params.x); +#define DUP (T , x, ...) dup_param(#T, &error->params.x);I915_PARAMS_FOR_EACH (DUP );#undef DUP
drivers/gpu/drm/i915/i915_params.c +3 -39
48 lines not on this page · raw message
drivers/gpu/drm/i915/i915_params.h +41 -41
90 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
Quoting Michal Wajdeczko (2017-09-22 15:27:25)
Quoted 10 lines
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>
Overall, I think this is a positive change. I'm not completely happy that the param() macro is more readable than the struct assignment, but that is offset by the reduction in duplication.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
Acked-byRe: [RFC 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
Quoted 7 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-09-22 15:27:25)
Quoted 6 lines
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Overall, I think this is a positive change. I'm not completely happy that the
param()macro is more readable than the struct assignment, but that is offset by the reduction in duplication.
I'm also not completely happy that the default values get moved away from the param descriptions. (Hmm, what next, putting the permissions and descriptions in I915_PARAMS_FOR_EACH too?! :o)
There's also the benefit of being able to highlight the changed values and displaying the defaults in debugfs if desired.
On the series,
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [RFC 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
Quoted 17 lines · Jani Nikula
Quoted 7 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-09-22 15:27:25)
Quoted 6 lines
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Overall, I think this is a positive change. I'm not completely happy that the
param()macro is more readable than the struct assignment, but that is offset by the reduction in duplication.
Quoted 6 lines
I'm also not completely happy that the default values get moved away from the param descriptions. (Hmm, what next, putting the permissions and descriptions in
I915_PARAMS_FOR_EACHtoo?! :o)There's also the benefit of being able to highlight the changed values and displaying the defaults in debugfs if desired.
Yes, I think this would be useful going forward.
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
Re: [RFC 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
In reply to Jani NikulaQuoted 13 lines · Jani Nikula
Quoted 12 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-09-22 15:27:25)
Quoted 10 lines
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>
Quoted 8 lines
Quoted 3 lines
Overall, I think this is a positive change. I'm not completely happy that the
param()macro is more readable than the struct assignment, but that is offset by the reduction in duplication.I'm also not completely happy that the default values get moved away from the param descriptions. (Hmm, what next, putting the permissions and descriptions in
I915_PARAMS_FOR_EACHtoo?! :o)
In fact, I was already trying that ;)
https://patchwork.freedesktop.org/patch/162037/
Quoted 2 lines
There's also the benefit of being able to highlight the changed values and displaying the defaults in debugfs if desired.
And such highlight was also there
https://patchwork.freedesktop.org/patch/162038/
Michal
Quoted 5 lines
On the series,
Acked-by Jani Nikula <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
In reply to Michal WajdeczkoQuoted 10 lines · Michal Wajdeczko
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>
Ha, seems like you beat me to it :) (https://lists.freedesktop.org/arch
ives/intel-gfx/2017-September/139268.html)
<SNIP>
Quoted 34 lines
drivers/gpu/drm/i915/i915_params.c +0
-30@@ -33,45 +33,9 @@ MODULE_PARM_DESC(name, desc)struct i915_params i915_modparams__read_mostly = { - .modeset =-1 , - .panel_ignore_lid =1 , - .semaphores =-1 , - .lvds_channel_mode =0 , - .panel_use_ssc =-1 , - .vbt_sdvo_panel_type =-1 , - .enable_rc6 =-1 , - .enable_dc =-1 , - .enable_fbc =-1 , - .enable_execlists =-1 , - .enable_hangcheck = true, - .enable_ppgtt =-1 , - .enable_psr =-1 , - .alpha_support =IS_ENABLED (CONFIG_DRM_I915_ALPHA_SUPPORT ), - .disable_power_well =-1 , - .enable_ips =1 , - .fastboot =0 , - .prefault_disable =0 , - .load_detect_test =0 , - .force_reset_modeset_test =0 , - .reset =2 , - .error_capture = true, - .invert_brightness =0 , - .disable_display =0 , - .enable_cmd_parser = true, - .use_mmio_flip =0 , - .mmio_debug =0 , - .verbose_state_checks =1 , - .nuclear_pageflip =0 , - .edp_vswing =0 ,
drivers/gpu/drm/i915/i915_params.c line 36
Quoted 10 lines
drivers/gpu/drm/i915/i915_params.c +1
-9- .enable_guc_loading = 0, - .enable_guc_submission = 0, - .guc_log_level = -1, - .guc_firmware_path = NULL, - .huc_firmware_path = NULL, - .enable_dp_mst = true, - .inject_load_failure = 0, - .enable_dpcd_backlight = false, - .enable_gvt = false, +#define MEMBER (T , member, value) .member = value,
Should be .member = (value),
With that;
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
RFC 3/3 drm/i915: Fix default values of some modparams
In reply to Michal WajdeczkoMembers should be initialized with values of matching types.
--- drivers/gpu/drm/i915/i915_params.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_params.h +7 -7
@@ -58,14 +58,14 @@ param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \ param(bool, enable_cmd_parser, true) \ param(bool, enable_hangcheck, true) \ - param(bool, fastboot, 0) \ - param(bool, prefault_disable, 0) \ - param(bool, load_detect_test, 0) \ - param(bool, force_reset_modeset_test, 0) \ + param(bool, fastboot, false) \ + param(bool, prefault_disable, false) \ + param(bool, load_detect_test, false) \ + param(bool, force_reset_modeset_test, false) \ param(bool, error_capture, true) \ - param(bool, disable_display, 0) \ - param(bool, verbose_state_checks, 1) \ - param(bool, nuclear_pageflip, 0) \ + param(bool, disable_display, false) \ + param(bool, verbose_state_checks, true) \ + param(bool, nuclear_pageflip, false) \ param(bool, enable_dp_mst, true) \ param(bool, enable_dpcd_backlight, false) \param (bool, enable_gvt, false)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [RFC 3/3] drm/i915: Fix default values of some modparams
Quoting Michal Wajdeczko (2017-09-22 15:27:26)
Quoted 6 lines
Members should be initialized with values of matching types.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>
Perhaps typecheck(T, value) could sneak in somewhere. Add a sanitycheck to i915_params.c?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [RFC,1/3] drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: series starting with [RFC,1/3] drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
URL : https://patchwork.freedesktop.org/series/30768/
State : success
== Summary ==
Series 30768v1 series starting with [RFC,1/3] drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
https://patchwork.freedesktop.org/api/1.0/series/30768/revisions/1/mbox/
Test chamelium:
Subgroup dp-edid-read:
pass -> FAIL (fi-kbl-7500u) fdo#102672
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> INCOMPLETE (fi-kbl-r) fdo#102850
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215
Test drv_module_reload:
Subgroup basic-no-display:
dmesg-warn -> PASS (fi-glk-1) fdo#102777fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#102850 https://bugs.freedesktop.org/show_bug.cgi?id=102850
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:441s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:467s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:414s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:510s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:504s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:490s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:486s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:539s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:413s fi-glk-1 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:565s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:423s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:404s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:432s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:485s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:462s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:465s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:581s fi-kbl-r total:118 pass:97 dwarn:0 dfail:0 fail:0 skip:20 fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:537s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:452s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:749s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:468s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:567s fi-snb-2600 total:289 pass:248 dwarn:0 dfail:0 fail:2 skip:39 time:417s
e0e308721fd283e1c5777657a5941f178f0d49e6 drm-tip: 2017y-09m-22d-13h-31m-38s UTC integration manifest 60390eec06dc drm/i915: Fix default values of some modparams2505ec2c4681 drm/i915: Extend I915_PARAMS_FOR_EACH with default member value b16f668e9734 drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5794/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Michal Wajdeczko (2017-09-22 15:27:24)
Quoted 7 lines
We should not add trailing ; after each member allow other than statements-style uses of this helper macro. While here s/func/param for clarity.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>
Ok, looks like the trailing ; already snuck into the other users.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [RFC,1/3] drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: series starting with [RFC,1/3] drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
URL : https://patchwork.freedesktop.org/series/30768/
State : failure
== Summary ==
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252 +1
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-pri-indfb-draw-blt:
skip -> PASS (shard-hsw)
Test kms_atomic_transition:
Subgroup plane-all-transition-nonblocking-fencing:
pass -> FAIL (shard-hsw)
Test kms_draw_crc:
Subgroup draw-method-xrgb8888-mmap-wc-xtiled:
pass -> SKIP (shard-hsw)fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2429 pass:1330 dwarn:1 dfail:0 fail:14 skip:1084 time:9861s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5794/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/3 drm/i915: Make I915_PARAMS_FOR_EACH macro more flexible
In reply to Michal WajdeczkoWe should not add trailing ; after each member allow other than statements-style uses of this helper macro. While here s/func/param for clarity.
--- drivers/gpu/drm/i915/i915_params.h | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_params.h +42 -42
@@ -27,50 +27,50 @@#include <linux/cache.h> /* for __read_mostly */ -#define I915_PARAMS_FOR_EACH (func) \ - func(char *, vbt_firmware); \ - func(int, modeset); \ - func(int, panel_ignore_lid); \ - func(int, semaphores); \ - func(int, lvds_channel_mode); \ - func(int, panel_use_ssc); \ - func(int, vbt_sdvo_panel_type); \ - func(int, enable_rc6); \ - func(int, enable_dc); \ - func(int, enable_fbc); \ - func(int, enable_ppgtt); \ - func(int, enable_execlists); \ - func(int, enable_psr); \ - func(int, disable_power_well); \ - func(int, enable_ips); \ - func(int, invert_brightness); \ - func(int, enable_guc_loading); \ - func(int, enable_guc_submission); \ - func(int, guc_log_level); \ - func(char *, guc_firmware_path); \ - func(char *, huc_firmware_path); \ - func(int, use_mmio_flip); \ - func(int, mmio_debug); \ - func(int, edp_vswing); \ - func(int, reset); \ - func(unsigned int, inject_load_failure); \ +#define I915_PARAMS_FOR_EACH (param) \ + param(char *, vbt_firmware) \ + param(int, modeset) \ + param(int, panel_ignore_lid) \ + param(int, semaphores) \ + param(int, lvds_channel_mode) \ + param(int, panel_use_ssc) \ + param(int, vbt_sdvo_panel_type) \ + param(int, enable_rc6) \ + param(int, enable_dc) \ + param(int, enable_fbc) \ + param(int, enable_ppgtt) \ + param(int, enable_execlists) \ + param(int, enable_psr) \ + param(int, disable_power_well) \ + param(int, enable_ips) \ + param(int, invert_brightness) \ + param(int, enable_guc_loading) \ + param(int, enable_guc_submission) \ + param(int, guc_log_level) \ + param(char *, guc_firmware_path) \ + param(char *, huc_firmware_path) \ + param(int, use_mmio_flip) \ + param(int, mmio_debug) \ + param(int, edp_vswing) \ + param(int, reset) \ + param(unsigned int, inject_load_failure) \/* leave bools at the end to not create holes */ \ -func (bool, alpha_support); \ -func (bool, enable_cmd_parser); \ -func (bool, enable_hangcheck); \ -func (bool, fastboot); \ -func (bool, prefault_disable); \ -func (bool, load_detect_test); \ -func (bool, force_reset_modeset_test); \ -func (bool, error_capture); \ -func (bool, disable_display); \ -func (bool, verbose_state_checks); \ -func (bool, nuclear_pageflip); \ -func (bool, enable_dp_mst); \ -func (bool, enable_dpcd_backlight); \ - func(bool, enable_gvt) + param(bool, alpha_support) \ + param(bool, enable_cmd_parser) \ + param(bool, enable_hangcheck) \ + param(bool, fastboot) \ + param(bool, prefault_disable) \ + param(bool, load_detect_test) \ + param(bool, force_reset_modeset_test) \ + param(bool, error_capture) \ + param(bool, disable_display) \ + param(bool, verbose_state_checks) \ + param(bool, nuclear_pageflip) \ + param(bool, enable_dp_mst) \ + param(bool, enable_dpcd_backlight) \ + param(bool, enable_gvt) -#define MEMBER (T , member) T member +#define MEMBER (T , member) T member;struct i915_params {I915_PARAMS_FOR_EACH (MEMBER); };
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
v2: make MEMBER macro more robust (Joonas)
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +-- drivers/gpu/drm/i915/i915_params.c | 42 ++---------------- drivers/gpu/drm/i915/i915_params.h | 82 +++++++++++++++++------------------ 4 files changed, 48 insertions(+), 84 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -67,7 +67,7 @@ static int i915_capabilities(struct seq_file *m, void *data)#undef PRINT_FLAGkernel_param_lock (THIS_MODULE ); -#define PRINT_PARAM (T , x) seq_print_param(m, #x, #T, &i915_modparams.x); +#define PRINT_PARAM (T , x, ...) seq_print_param(m, #x, #T, &i915_modparams.x);I915_PARAMS_FOR_EACH (PRINT_PARAM );#undef PRINT_PARAMkernel_param_unlock (THIS_MODULE );
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -572,7 +572,7 @@ static __always_inline void err_print_param(struct drm_i915_error_state_buf *m,static void err_print_params (struct drm_i915_error_state_buf *m,const struct i915_params *p) { -#define T , x) err_print_param(m, #x, #T, &p->x); +#define T , x, ...) err_print_param(m, #x, #T, &p->x);I915_PARAMS_FOR_EACH (#undef PRINT }
@@ -866,7 +866,7 @@ void __i915_gpu_state_free(struct kref *error_ref)kfree (error->overlay);kfree (error->display); -#define FREE (T , x) free_param(#T, &error->params.x); +#define FREE (T , x, ...) free_param(#T, &error->params.x);I915_PARAMS_FOR_EACH (FREE );#undef FREE
@@ -1704,7 +1704,7 @@ static int capture(void *data) error->i915->gt.last_init_time)); error->params = i915_modparams; -#define DUP (T , x) dup_param(#T, &error->params.x); +#define DUP (T , x, ...) dup_param(#T, &error->params.x);I915_PARAMS_FOR_EACH (DUP );#undef DUP
drivers/gpu/drm/i915/i915_params.c +3 -39
48 lines not on this page · raw message
drivers/gpu/drm/i915/i915_params.h +41 -41
90 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v2 2/3] drm/i915: Extend I915_PARAMS_FOR_EACH with default member value
Quoted 15 lines · Michal Wajdeczko
By combining default value into helper macro we can initialize modparams struct in the same automatic way as it was declared. This will initialize members in the same order as declared and additionally will disallow declaring new member without proper default value for it.
v2: make MEMBER macro more robust (Joonas)
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Jani Nikula <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Chris Wilson <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]>
<SNIP>
Quoted 36 lines
+++
b/drivers/gpu/drm/i915/i915_params.cdrivers/gpu/drm/i915/i915_params.c +0
-31@@ -33,45 +33,9 @@ MODULE_PARM_DESC(name, desc)struct i915_params i915_modparams__read_mostly = { - .modeset =-1 , - .panel_ignore_lid =1 , - .semaphores =-1 , - .lvds_channel_mode =0 , - .panel_use_ssc =-1 , - .vbt_sdvo_panel_type =-1 , - .enable_rc6 =-1 , - .enable_dc =-1 , - .enable_fbc =-1 , - .enable_execlists =-1 , - .enable_hangcheck = true, - .enable_ppgtt =-1 , - .enable_psr =-1 , - .alpha_support =IS_ENABLED (CONFIG_DRM_I915_ALPHA_SUPPORT ), - .disable_power_well =-1 , - .enable_ips =1 , - .fastboot =0 , - .prefault_disable =0 , - .load_detect_test =0 , - .force_reset_modeset_test =0 , - .reset =2 , - .error_capture = true, - .invert_brightness =0 , - .disable_display =0 , - .enable_cmd_parser = true, - .use_mmio_flip =0 , - .mmio_debug =0 , - .verbose_state_checks =1 , - .nuclear_pageflip =0 , - .edp_vswing =0 , - .enable_guc_loading =0 ,
drivers/gpu/drm/i915/i915_params.c line 37
Quoted 10 lines
drivers/gpu/drm/i915/i915_params.c +2
-8- .enable_guc_submission = 0, - .guc_log_level = -1, - .guc_firmware_path = NULL, - .huc_firmware_path = NULL, - .enable_dp_mst = true, - .inject_load_failure = 0, - .enable_dpcd_backlight = false, - .enable_gvt = false, +#define MEMBER (T , member, value) .member = (value), +I915_PARAMS_FOR_EACH (MEMBER )
To fix the problem that next patch is needed for;
.member = typecheck(T, (value)) ? (value) : (value),
Assuming it won't mess up GCC code generation. Can be sent as an extra patch on top when this gets in.
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
PATCH v2 3/3 drm/i915: Fix default values of some modparams
In reply to Michal WajdeczkoMembers should be initialized with values of matching types.
--- drivers/gpu/drm/i915/i915_params.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_params.h +7 -7
@@ -58,14 +58,14 @@ param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \ param(bool, enable_cmd_parser, true) \ param(bool, enable_hangcheck, true) \ - param(bool, fastboot, 0) \ - param(bool, prefault_disable, 0) \ - param(bool, load_detect_test, 0) \ - param(bool, force_reset_modeset_test, 0) \ + param(bool, fastboot, false) \ + param(bool, prefault_disable, false) \ + param(bool, load_detect_test, false) \ + param(bool, force_reset_modeset_test, false) \ param(bool, error_capture, true) \ - param(bool, disable_display, 0) \ - param(bool, verbose_state_checks, 1) \ - param(bool, nuclear_pageflip, 0) \ + param(bool, disable_display, false) \ + param(bool, verbose_state_checks, true) \ + param(bool, nuclear_pageflip, false) \ param(bool, enable_dp_mst, true) \ param(bool, enable_dpcd_backlight, false) \param (bool, enable_gvt, false)
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: failure for series starting with [v2,3/3] drm/i915: Fix default values of some modparams (rev4)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: series starting with [v2,3/3] drm/i915: Fix default values of some modparams (rev4)
URL : https://patchwork.freedesktop.org/series/30768/
State : failure
== Summary ==
Series 30768 revision 4 was fully merged or fully failed: no git log
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx