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

Message ID 20200121103020.26494-1-jani.nikula@intel.com
State New
Headers show
Series
  • drm/i915: drop alpha_support for good in favour of force_probe
Related show

Commit Message

Jani Nikula Jan. 21, 2020, 10:30 a.m. UTC
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>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/Kconfig       | 7 -------
 drivers/gpu/drm/i915/i915_params.c | 3 ---
 drivers/gpu/drm/i915/i915_params.h | 1 -
 drivers/gpu/drm/i915/i915_pci.c    | 7 -------
 4 files changed, 18 deletions(-)

Comments

Joonas Lahtinen Jan. 21, 2020, 12:01 p.m. UTC | #1
Quoting Jani Nikula (2020-01-21 12:30:20)
> 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>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas
Rodrigo Vivi Jan. 21, 2020, 5:27 p.m. UTC | #2
On Jan 21, 2020, at 4:01 AM, Joonas Lahtinen <joonas.lahtinen@linux.intel.com<mailto:joonas.lahtinen@linux.intel.com>> wrote:

Quoting Jani Nikula (2020-01-21 12:30:20)
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<mailto:arkadiusz.hiler@intel.com>>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com<mailto:joonas.lahtinen@linux.intel.com>>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com<mailto:rodrigo.vivi@intel.com>>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com<mailto:tomi.p.sarvela@intel.com>>
Signed-off-by: Jani Nikula <jani.nikula@intel.com<mailto:jani.nikula@intel.com>>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com<mailto:joonas.lahtinen@linux.intel.com>>

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com<mailto:rodrigo.vivi@intel.com>>


Regards, Joonas
Jani Nikula Jan. 22, 2020, 9:14 a.m. UTC | #3
On Tue, 21 Jan 2020, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote:
>  On Jan 21, 2020, at 4:01 AM, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
>
>  Quoting Jani Nikula (2020-01-21 12:30:20)
>
>  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>
>  Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
>  Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Thanks for the reviews/acks, pushed to drm-intel-next-queued.

BR,
Jani.

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index ba9595960bbe..023206136d6d 100644
--- 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 905decc36e53..9c8257cf88d0 100644
--- 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 947d0a38fa3c..ef4069645cb8 100644
--- 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 83f01401b8b5..6fbec2e7068d 100644
--- 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;