--- vresend
+++ v2
@@ -1,14 +1,11 @@
-[ resend with all relevant people as Cc now, sorry to others for the spam ]
-
-There is a lot of historical baggage on this parameter. It's defined in
-the vgacon driver as a "nomodeset" parameter, but it's handler function is
-called text_mode() that sets a variable named vgacon_text_mode_force whose
-value is queried with a function named vgacon_text_force().
+There is a lot of historical baggage on this parameter. It is defined in
+the vgacon driver as nomodeset, but its set function is called text_mode()
+and the value queried with a function named vgacon_text_force().
All this implies that it's about forcing text mode for VGA, yet it is not
used in neither vgacon nor other console driver. The only users for these
are DRM drivers, that check for the vgacon_text_force() return value to
-determine whether the driver could be loaded or not.
+determine whether the driver should be loaded or not.
That makes it quite confusing to read the code, because the variables and
function names don't reflect what they actually do and also are not in the
@@ -24,48 +21,50 @@
But there may be other reasons why this could be the case, so it is better
to encapsulate the logic in a separate function to make clear what's about.
-Patch #1 is just a trivial fix for a comment that isn't referring to the
-correct kernel parameter.
+This is a v2 of the patches, that address the issues pointed out by Thomas
+Zimmermann and Jani Nikula in v1:
-Patch #2 moves the nomodeset logic to the DRM subsystem.
+https://lore.kernel.org/lkml/5b4e4534-4786-d231-e331-78fdb5d8496a@redhat.com/T/
-Patch #3 renames the vgacon_text_force() function and accompaning logic as
-drm_modeset_disabled(), which is what this function is really about.
+Patch #1 adds a drm_drv_enabled() function that could be used by drivers to
+check if these could be enabled, instead of just using vgacon_text_force().
-Patch #4 adds a drm_drv_enabled() function that could be used by drivers
-to check if could be enabled.
+Patch #2 moves the nomodeset logic to the DRM subsystem and renames the
+functions and variables to better explain what these actually do.
-Patch #5 uses the drm_drv_enabled() function to check this instead of just
-checking if nomodeset has been set.
+Changes in v2:
+- Squash patch to add drm_drv_enabled() and make drivers use it.
+- Make the drivers changes before moving nomodeset logic to DRM.
+- Make drm_drv_enabled() return an errno and -ENODEV if nomodeset.
+- Remove debug and error messages in drivers.
+- Conditionally build drm_nomodeset.o if CONFIG_VGA_CONSOLE is set.
+- Squash patches to move nomodeset logic to DRM and do the renaming.
+- Name the function drm_check_modeset() and make it return -ENODEV.
-
-Javier Martinez Canillas (5):
- drm/i915: Fix comment about modeset parameters
- drm: Move nomodeset kernel parameter handler to the DRM subsystem
- drm: Rename vgacon_text_force() function to drm_modeset_disabled()
- drm: Add a drm_drv_enabled() helper function
- drm: Use drm_drv_enabled() instead of drm_modeset_disabled()
+Javier Martinez Canillas (2):
+ drm: Add a drm_drv_enabled() to check if drivers should be enabled
+ drm: Move nomodeset kernel parameter to the DRM subsystem
drivers/gpu/drm/Makefile | 2 ++
- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 ++---
- drivers/gpu/drm/ast/ast_drv.c | 3 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +++-----
+ drivers/gpu/drm/ast/ast_drv.c | 8 +++++---
drivers/gpu/drm/drm_drv.c | 21 ++++++++++++++++++++
drivers/gpu/drm/drm_nomodeset.c | 26 +++++++++++++++++++++++++
- drivers/gpu/drm/i915/i915_module.c | 10 +++++-----
- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +--
- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +--
- drivers/gpu/drm/qxl/qxl_drv.c | 3 +--
- drivers/gpu/drm/radeon/radeon_drv.c | 3 +--
- drivers/gpu/drm/tiny/bochs.c | 3 +--
- drivers/gpu/drm/tiny/cirrus.c | 3 +--
- drivers/gpu/drm/vboxvideo/vbox_drv.c | 5 +----
- drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +--
- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +--
+ drivers/gpu/drm/i915/i915_module.c | 8 +++++---
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 8 +++++---
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 6 ++++--
+ drivers/gpu/drm/qxl/qxl_drv.c | 8 +++++---
+ drivers/gpu/drm/radeon/radeon_drv.c | 7 ++++---
+ drivers/gpu/drm/tiny/bochs.c | 8 +++++---
+ drivers/gpu/drm/tiny/cirrus.c | 9 ++++++---
+ drivers/gpu/drm/vboxvideo/vbox_drv.c | 10 +++++-----
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 +++---
drivers/video/console/vgacon.c | 21 --------------------
include/drm/drm_drv.h | 1 +
include/drm/drm_mode_config.h | 6 ++++++
include/linux/console.h | 6 ------
- 19 files changed, 73 insertions(+), 57 deletions(-)
+ 19 files changed, 109 insertions(+), 66 deletions(-)
create mode 100644 drivers/gpu/drm/drm_nomodeset.c
--