drm/i915: drop alpha_support for good in favour of force_probe

It's been a long enough transition period since the DRM_I915_FORCE_PROBE
config and i915.force_probe module parameter were introduced in commit
7ef5ef5cdead ("drm/i915: add force_probe module parameter to replace
alpha_support"). Remove alpha support.

Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200121103020.26494-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index ba9595960bbebf290170a2bfb6247320a5fb8a21..023206136d6df04d1fbe9cd97106da456f2a44c3 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -42,16 +42,9 @@ config DRM_I915
 
          If "M" is selected, the module will be called i915.
 
-config DRM_I915_ALPHA_SUPPORT
-       bool "Enable alpha quality support for new Intel hardware by default"
-       depends on DRM_I915
-       help
-         This option is deprecated. Use DRM_I915_FORCE_PROBE option instead.
-
 config DRM_I915_FORCE_PROBE
        string "Force probe driver for selected new Intel hardware"
        depends on DRM_I915
-       default "*" if DRM_I915_ALPHA_SUPPORT
        help
          This is the default value for the i915.force_probe module
          parameter. Using the module parameter overrides this option.

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 905decc36e534cda17ebd509e0618bd676129283..9c8257cf88d07c7fa82c384d734cf8b8a5c97c4a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -92,9 +92,6 @@ i915_param_named_unsafe(force_probe, charp, 0400,
        "Force probe the driver for specified devices. "
        "See CONFIG_DRM_I915_FORCE_PROBE for details.");
 
-i915_param_named_unsafe(alpha_support, bool, 0400,
-       "Deprecated. See i915.force_probe.");
-
 i915_param_named_unsafe(disable_power_well, int, 0400,
        "Disable display power wells when possible "
        "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)");

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 947d0a38fa3c04c3a7a7370376223beead855e69..ef4069645cb8fcd8b989f6ec272e883bdd7936ac 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -70,7 +70,6 @@ struct drm_printer;
        param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
        param(unsigned long, fake_lmem_start, 0, 0400) \
        /* leave bools at the end to not create holes */ \
-       param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT), 0400) \
        param(bool, enable_hangcheck, true, 0600) \
        param(bool, prefault_disable, false, 0600) \
        param(bool, load_detect_test, false, 0600) \

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 83f01401b8b5c5758dea58f7c8ed5dcf6c22c21c..6fbec2e7068ddd8ffa5d5654568761f0c0cc7f6a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -928,13 +928,6 @@ static bool force_probe(u16 device_id, const char *devices)
        char *s, *p, *tok;
        bool ret;
 
-       /* FIXME: transitional */
-       if (i915_modparams.alpha_support) {
-               DRM_INFO("i915.alpha_support is deprecated, use i915.force_probe=%04x instead\n",
-                        device_id);
-               return true;
-       }
-
        if (!devices || !*devices)
                return false;