drm/i915: Remove 'prefault_disable' modparam

The 'prefault_disable' modparam was used by IGT to prevent a few
prefaulting operations to make fault handling under struct_mutex more
prominent. With the removal of struct_mutex, this is not as important
any more and we have almost completely stopped using the parameter. The
remaining use in execbuf is now immaterial and can be dropped without
affecting coverage.

We must re-address the idea of fault injection though.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200124230656.687503-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index cae0581d7e47f75bfbf01cc11bee0fb2190b945d..87fa5f42c39a85e67e02001905ea57a9a2ac7538 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1646,9 +1646,6 @@ static int eb_prefault_relocations(const struct i915_execbuffer *eb)
        const unsigned int count = eb->buffer_count;
        unsigned int i;
 
-       if (unlikely(i915_modparams.prefault_disable))
-               return 0;
-
        for (i = 0; i < count; i++) {
                int err;
 

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 9c8257cf88d07c7fa82c384d734cf8b8a5c97c4a..add00ec1f7878bf96d0189d17e01d662ab204e6d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -103,10 +103,6 @@ i915_param_named(fastboot, int, 0600,
        "(0=disabled, 1=enabled) "
        "Default: -1 (use per-chip default)");
 
-i915_param_named_unsafe(prefault_disable, bool, 0600,
-       "Disable page prefaulting for pread/pwrite/reloc (default:false). "
-       "For developers only.");
-
 i915_param_named_unsafe(load_detect_test, bool, 0600,
        "Force-enable the VGA load detect code for testing (default:false). "
        "For developers only.");

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index ef4069645cb8fcd8b989f6ec272e883bdd7936ac..cb16410c2ada0ed707e4d94e6eda6263daad63a2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -71,7 +71,6 @@ struct drm_printer;
        param(unsigned long, fake_lmem_start, 0, 0400) \
        /* leave bools at the end to not create holes */ \
        param(bool, enable_hangcheck, true, 0600) \
-       param(bool, prefault_disable, false, 0600) \
        param(bool, load_detect_test, false, 0600) \
        param(bool, force_reset_modeset_test, false, 0600) \
        param(bool, error_capture, true, 0600) \