[Intel-gfx] [RFC] drm/i915: rename alpha_support to preliminary_support.
Rodrigo Vivi
rodrigo.vivi at intel.com
Tue Nov 27 01:51:34 UTC 2018
The preliminary support protection flag exists mainly to protect
users with brand new Hardware from having bad experience when
using Linux distribution images containing old kernel versions from
preliminary development times. Distro's ISO images don't get frequent
updates.
This tag was previously created as "preliminary_hw_support",
but later renamed to "alpha_support" since "hw" was causing
some sort of confusion.
Unfortunately the rename brought us a bigger internal problem
since this created yet another ambiguity with project milestones
for a new platform.
By removing the "_hw_", and properly documenting it, both ambiguities
should now be solved.
Many other options were considered:
- under_development
- unsafe_driver
- force_modeset_on_unstable_driver
- and many other variations...
But returning it to something close to the original version we might
minimize the confusion with yet another different name for this flag.
Referrence: https://patchwork.kernel.org/patch/9405229
Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
drivers/gpu/drm/i915/Kconfig | 17 +++++++++--------
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/i915_params.c | 8 +++++---
drivers/gpu/drm/i915/i915_params.h | 3 ++-
drivers/gpu/drm/i915/i915_pci.c | 12 +++++++-----
drivers/gpu/drm/i915/intel_csr.c | 2 +-
drivers/gpu/drm/i915/intel_device_info.h | 2 +-
7 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 33a458b7f1fc..c1d1ed7f42bf 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -42,20 +42,21 @@ 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"
+config DRM_I915_PRELIMINARY_SUPPORT
+ bool "Enable under development driver for new Intel hardware by default"
depends on DRM_I915
default n
help
Choose this option if you have new Intel hardware and want to enable
- the alpha quality i915 driver support for the hardware in this kernel
- version. You can also enable the support at runtime using the module
- parameter i915.alpha_support=1; this option changes the default for
- that module parameter.
+ unstable driver from preliminary stages of development.
+ You can also enable the support at runtime using the module
+ parameter i915.preliminary_support=1; this option changes the default
+ for that module parameter.
It is recommended to upgrade to a kernel version with proper support
- as soon as it is available. Generally fixes for platforms with alpha
- support are not backported to older kernels.
+ as soon as it is available. Generally, fixes for platforms under
+ preliminary support protection flag are not backported to older
+ kernels versions.
If in doubt, say "N".
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f763b30f98d9..bc79bc5b1691 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2325,7 +2325,7 @@ intel_info(const struct drm_i915_private *dev_priv)
#define IS_CNL_WITH_PORT_F(dev_priv) (IS_CANNONLAKE(dev_priv) && \
(INTEL_DEVID(dev_priv) & 0x0004) == 0x0004)
-#define IS_ALPHA_SUPPORT(intel_info) ((intel_info)->is_alpha_support)
+#define PRELIMINARY_SUPPORT(intel_info) ((intel_info)->preliminary_support)
#define SKL_REVID_A0 0x0
#define SKL_REVID_B0 0x1
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 2e0356561839..1c6904a37096 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -87,9 +87,11 @@ i915_param_named_unsafe(enable_psr, int, 0600,
"(0=disabled, 1=enabled) "
"Default: -1 (use per-chip default)");
-i915_param_named_unsafe(alpha_support, bool, 0400,
- "Enable alpha quality driver support for latest hardware. "
- "See also CONFIG_DRM_I915_ALPHA_SUPPORT.");
+i915_param_named_unsafe(preliminary_support, bool, 0400,
+ "Force the probe and the use of an unstable and preliminary driver."
+ "This flag protects brand new hardware from old preliminary software."
+ "Don't use this flag on production. Please upgrade your kernel instead."
+ "See also CONFIG_DRM_I915_PRELIMINARY_SUPPORT.");
i915_param_named_unsafe(disable_power_well, int, 0400,
"Disable display power wells when possible "
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 7e56c516c815..0e2ae6456980 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -55,7 +55,8 @@ struct drm_printer;
param(int, reset, 2) \
param(unsigned int, inject_load_failure, 0) \
/* leave bools at the end to not create holes */ \
- param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
+ param(bool, preliminary_support, \
+ IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_SUPPORT)) \
param(bool, enable_hangcheck, true) \
param(bool, fastboot, false) \
param(bool, prefault_disable, false) \
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 1b81d7cb209e..b739df6c8de9 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -629,7 +629,7 @@ static const struct intel_device_info intel_cannonlake_info = {
static const struct intel_device_info intel_icelake_11_info = {
GEN11_FEATURES,
PLATFORM(INTEL_ICELAKE),
- .is_alpha_support = 1,
+ .preliminary_support = 1,
.ring_mask = RENDER_RING | BLT_RING | VEBOX_RING | BSD_RING | BSD3_RING,
};
@@ -723,10 +723,12 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
(struct intel_device_info *) ent->driver_data;
int err;
- if (IS_ALPHA_SUPPORT(intel_info) && !i915_modparams.alpha_support) {
- DRM_INFO("The driver support for your hardware in this kernel version is alpha quality\n"
- "See CONFIG_DRM_I915_ALPHA_SUPPORT or i915.alpha_support module parameter\n"
- "to enable support in this kernel version, or check for kernel updates.\n");
+ if (PRELIMINARY_SUPPORT(intel_info) &&
+ !i915_modparams.preliminary_support) {
+ DRM_INFO("The driver support for your hardware in this kernel version was under\n"
+ "preliminary stages of development. See CONFIG_DRM_I915_PRELIMINARY_SUPPORT\n"
+ "or i915.preliminary_support module parameter to enable support in this kernel\n"
+ " version, or check for kernel updates.\n");
return -ENODEV;
}
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index a516697bf57d..9c9a0fd598e8 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -512,7 +512,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
if (csr->fw_path == NULL) {
DRM_DEBUG_KMS("No known CSR firmware for platform, disabling runtime PM\n");
- WARN_ON(!IS_ALPHA_SUPPORT(INTEL_INFO(dev_priv)));
+ WARN_ON(!PRELIMINARY_SUPPORT(INTEL_INFO(dev_priv)));
return;
}
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 88f97210dc49..711b21fbaab8 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -86,7 +86,7 @@ enum intel_ppgtt {
#define DEV_INFO_FOR_EACH_FLAG(func) \
func(is_mobile); \
func(is_lp); \
- func(is_alpha_support); \
+ func(preliminary_support); \
/* Keep has_* in alphabetical order */ \
func(has_64bit_reloc); \
func(has_csr); \
--
2.19.1
More information about the Intel-gfx
mailing list