| Message ID | 20220826092343.184568-1-joonas.lahtinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915/guc: Remove log size module parameters | expand |
On Fri, Aug 26, 2022 at 12:23:43PM +0300, Joonas Lahtinen wrote: > Remove the module parameters for configuring GuC log size. > > We should instead rely on tuning the defaults to be usable for > reporting bugs. > > v2: > - Use correct 1M unit > > Fixes: 8ad0152afb1b ("drm/i915/guc: Make GuC log sizes runtime configurable") > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: John Harrison <John.C.Harrison@Intel.com> > Cc: Alan Previn <alan.previn.teres.alexis@intel.com> > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 7 +++---- > drivers/gpu/drm/i915/i915_params.c | 12 ------------ > drivers/gpu/drm/i915/i915_params.h | 3 --- > 3 files changed, 3 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > index 3a2243b4ac9f..55d4b8f8e33e 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -79,9 +79,9 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) > } > }; > s32 params[GUC_LOG_SECTIONS_LIMIT] = { > - i915->params.guc_log_size_crash, > - i915->params.guc_log_size_debug, > - i915->params.guc_log_size_capture, > + GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE / SZ_1M, > + GUC_LOG_DEFAULT_DEBUG_BUFFER_SIZE / SZ_1M, > + GUC_LOG_DEFAULT_CAPTURE_BUFFER_SIZE / SZ_1M, > }; > int i; > > @@ -90,7 +90,6 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) > > /* If debug size > 1MB then bump default crash size to keep the same units */ > if (log->sizes[GUC_LOG_SECTIONS_DEBUG].bytes >= SZ_1M && > - (i915->params.guc_log_size_crash == -1) && > GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE < SZ_1M) > log->sizes[GUC_LOG_SECTIONS_CRASH].bytes = SZ_1M; > > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c > index 06ca5b822111..6fc475a5db61 100644 > --- a/drivers/gpu/drm/i915/i915_params.c > +++ b/drivers/gpu/drm/i915/i915_params.c > @@ -171,18 +171,6 @@ i915_param_named(guc_log_level, int, 0400, > "GuC firmware logging level. Requires GuC to be loaded. " > "(-1=auto [default], 0=disable, 1..4=enable with verbosity min..max)"); > > -i915_param_named(guc_log_size_crash, int, 0400, > - "GuC firmware logging buffer size for crash dumps (in MB)" > - "(-1=auto [default], NB: max = 4, other restrictions apply)"); > - > -i915_param_named(guc_log_size_debug, int, 0400, > - "GuC firmware logging buffer size for debug logs (in MB)" > - "(-1=auto [default], NB: max = 16, other restrictions apply)"); > - > -i915_param_named(guc_log_size_capture, int, 0400, > - "GuC error capture register dump buffer size (in MB)" > - "(-1=auto [default], NB: max = 4, other restrictions apply)"); > - > i915_param_named_unsafe(guc_firmware_path, charp, 0400, > "GuC firmware path to use instead of the default one"); > > diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h > index f684d1ab8707..2733cb6cfe09 100644 > --- a/drivers/gpu/drm/i915/i915_params.h > +++ b/drivers/gpu/drm/i915/i915_params.h > @@ -61,9 +61,6 @@ struct drm_printer; > param(int, invert_brightness, 0, 0600) \ > param(int, enable_guc, -1, 0400) \ > param(int, guc_log_level, -1, 0400) \ > - param(int, guc_log_size_crash, -1, 0400) \ > - param(int, guc_log_size_debug, -1, 0400) \ > - param(int, guc_log_size_capture, -1, 0400) \ > param(char *, guc_firmware_path, NULL, 0400) \ > param(char *, huc_firmware_path, NULL, 0400) \ > param(char *, dmc_firmware_path, NULL, 0400) \ > -- > 2.37.2 >
Quoting Patchwork (2022-08-26 13:54:30) > Patch Details > > Series: drm/i915/guc: Remove log size module parameters (rev2) > URL: https://patchwork.freedesktop.org/series/107780/ > State: success > Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107780v2/index.html > > CI Bug Log - changes from CI_DRM_12031 -> Patchwork_107780v2 > > Summary > > SUCCESS > > No regressions found. Pushed the patch. Thanks for the reviews. Regards, Joonas > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107780v2/ > index.html > > Participating hosts (38 -> 37) > > Additional (2): bat-adln-1 bat-dg1-5 > Missing (3): fi-hsw-4770 bat-rpls-2 bat-dg2-10 > > Possible new issues > > Here are the unknown changes that may have been introduced in > Patchwork_107780v2: > > IGT changes > > Suppressed > > The following results come from untrusted machines, tests, or statuses. > They do not affect the overall result. > > • igt@i915_pm_rps@basic-api: > □ {bat-adln-1}: NOTRUN -> SKIP > > Known issues > > Here are the changes found in Patchwork_107780v2 that come from known issues: > > IGT changes > > Issues hit > > • igt@fbdev@read: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#2582) +4 similar issues > • igt@gem_mmap@basic: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4083) > • igt@gem_tiled_fence_blits@basic: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4077) +2 similar issues > • igt@gem_tiled_pread_basic: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4079) +1 similar issue > • igt@i915_pm_backlight@basic-brightness: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#1155) > • igt@i915_pm_rps@basic-api: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#6621) > • igt@i915_selftest@live@gt_engines: > > □ bat-dg1-5: NOTRUN -> INCOMPLETE (i915#4418) > • igt@i915_suspend@basic-s3-without-i915: > > □ fi-rkl-11600: PASS -> INCOMPLETE (i915#5982) > • igt@kms_addfb_basic@basic-x-tiled-legacy: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4212) +7 similar issues > • igt@kms_addfb_basic@basic-y-tiled-legacy: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4215) > • igt@kms_busy@basic: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#1845 / i915#4303) > • igt@kms_chamelium@hdmi-hpd-fast: > > □ bat-dg1-5: NOTRUN -> SKIP (fdo#111827) +7 similar issues > • igt@kms_force_connector_basic@force-load-detect: > > □ bat-dg1-5: NOTRUN -> SKIP (fdo#109285) > • igt@kms_pipe_crc_basic@nonblocking-crc: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#4078) +13 similar issues > • igt@kms_psr@sprite_plane_onoff: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#1072 / i915#4078) +3 similar issues > • igt@kms_setmode@basic-clone-single-crtc: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#3555) > • igt@prime_vgem@basic-fence-flip: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#1845 / i915#3708) > • igt@prime_vgem@basic-fence-read: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#3708) +2 similar issues > • igt@prime_vgem@basic-gtt: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#3708 / i915#4077) +1 similar issue > • igt@prime_vgem@basic-userptr: > > □ bat-dg1-5: NOTRUN -> SKIP (i915#3708 / i915#4873) > • igt@runner@aborted: > > □ bat-dg1-5: NOTRUN -> FAIL (i915#4312 / i915#5257) > > Possible fixes > > • igt@i915_selftest@live@hangcheck: > > □ {fi-ehl-2}: INCOMPLETE (i915#5153) -> PASS > > □ {bat-dg2-11}: INCOMPLETE -> PASS > > • igt@i915_selftest@live@requests: > > □ {bat-rpls-1}: INCOMPLETE (i915#4983 / i915#6257 / i915#6380) -> PASS > > {name}: This element is suppressed. This means it is ignored when computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > Build changes > > • Linux: CI_DRM_12031 -> Patchwork_107780v2 > > CI-20190529: 20190529 > CI_DRM_12031: 3a648e054afa78544f00531084cad2d3c18c5b9f @ git:// > anongit.freedesktop.org/gfx-ci/linux > IGT_6636: 1298b5f0e1b3e010657ffba41d2e775fab028e08 @ https:// > gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_107780v2: 3a648e054afa78544f00531084cad2d3c18c5b9f @ git:// > anongit.freedesktop.org/gfx-ci/linux > > Linux commits > > 86ecb944c399 drm/i915/guc: Remove log size module parameters >
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c index 3a2243b4ac9f..55d4b8f8e33e 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c @@ -79,9 +79,9 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) } }; s32 params[GUC_LOG_SECTIONS_LIMIT] = { - i915->params.guc_log_size_crash, - i915->params.guc_log_size_debug, - i915->params.guc_log_size_capture, + GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE / SZ_1M, + GUC_LOG_DEFAULT_DEBUG_BUFFER_SIZE / SZ_1M, + GUC_LOG_DEFAULT_CAPTURE_BUFFER_SIZE / SZ_1M, }; int i; @@ -90,7 +90,6 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) /* If debug size > 1MB then bump default crash size to keep the same units */ if (log->sizes[GUC_LOG_SECTIONS_DEBUG].bytes >= SZ_1M && - (i915->params.guc_log_size_crash == -1) && GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE < SZ_1M) log->sizes[GUC_LOG_SECTIONS_CRASH].bytes = SZ_1M; diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 06ca5b822111..6fc475a5db61 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -171,18 +171,6 @@ i915_param_named(guc_log_level, int, 0400, "GuC firmware logging level. Requires GuC to be loaded. " "(-1=auto [default], 0=disable, 1..4=enable with verbosity min..max)"); -i915_param_named(guc_log_size_crash, int, 0400, - "GuC firmware logging buffer size for crash dumps (in MB)" - "(-1=auto [default], NB: max = 4, other restrictions apply)"); - -i915_param_named(guc_log_size_debug, int, 0400, - "GuC firmware logging buffer size for debug logs (in MB)" - "(-1=auto [default], NB: max = 16, other restrictions apply)"); - -i915_param_named(guc_log_size_capture, int, 0400, - "GuC error capture register dump buffer size (in MB)" - "(-1=auto [default], NB: max = 4, other restrictions apply)"); - i915_param_named_unsafe(guc_firmware_path, charp, 0400, "GuC firmware path to use instead of the default one"); diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index f684d1ab8707..2733cb6cfe09 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -61,9 +61,6 @@ struct drm_printer; param(int, invert_brightness, 0, 0600) \ param(int, enable_guc, -1, 0400) \ param(int, guc_log_level, -1, 0400) \ - param(int, guc_log_size_crash, -1, 0400) \ - param(int, guc_log_size_debug, -1, 0400) \ - param(int, guc_log_size_capture, -1, 0400) \ param(char *, guc_firmware_path, NULL, 0400) \ param(char *, huc_firmware_path, NULL, 0400) \ param(char *, dmc_firmware_path, NULL, 0400) \
Remove the module parameters for configuring GuC log size. We should instead rely on tuning the defaults to be usable for reporting bugs. v2: - Use correct 1M unit Fixes: 8ad0152afb1b ("drm/i915/guc: Make GuC log sizes runtime configurable") Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> Cc: Alan Previn <alan.previn.teres.alexis@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 7 +++---- drivers/gpu/drm/i915/i915_params.c | 12 ------------ drivers/gpu/drm/i915/i915_params.h | 3 --- 3 files changed, 3 insertions(+), 19 deletions(-)