drm/i915/guc: Remove log size module parameters

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>
Link: https://patchwork.freedesktop.org/patch/msgid/20220826092343.184568-1-joonas.lahtinen@linux.intel.com

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 3a2243b4ac9fc39f9d35dcfa313e39310d557624..55d4b8f8e33ea98e2480ff3380e92a79b4de8e1d 100644 (file)
--- 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 06ca5b82211188bbbe1420d0b078a080c2a4f013..6fc475a5db615c36a0115fef1ac3e5268453ae5c 100644 (file)
--- 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 f684d1ab870782aa6109f0f188f116f82e1844ea..2733cb6cfe0941a52c95228237022799e24275ea 100644 (file)
--- 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) \