drm/xe: Rename enable_display module param

The different approach used by xe regarding the initialization of
display HW has been proved a great addition for early driver bring up:
core xe can be tested without having all the bits sorted out on the
display side.

On the other hand, the approach exposed by i915-display is to *actively*
disable the display by programming it if needed, i.e. if it was left
enabled by firmware. It also has its use to make sure the HW is actually
disabled and not wasting power.

However having both the way it is in xe doesn't expose a good interface
wrt module params. From modinfo:

	disable_display:Disable display (default: false) (bool)
	enable_display:Enable display (bool)

Rename enable_display to probe_display to try to convey the message that
the HW is being touched and improve the module param description. To
avoid confusion, the enable_display is renamed everywhere, not only in
the module param. New description for the parameters:

	disable_display:Disable display (default: false) (bool)
	probe_display:Probe display HW, otherwise it's left untouched (default: true) (bool)

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240813141931.3141395-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 78cccbe2894758f61d3b1e8629d5f58556379a4f..56a940b39412ca6e56d252a7da473e627bb33f0f 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -45,7 +45,7 @@ static bool has_display(struct xe_device *xe)
  */
 bool xe_display_driver_probe_defer(struct pci_dev *pdev)
 {
-       if (!xe_modparam.enable_display)
+       if (!xe_modparam.probe_display)
                return 0;
 
        return intel_display_driver_probe_defer(pdev);
@@ -61,7 +61,7 @@ bool xe_display_driver_probe_defer(struct pci_dev *pdev)
  */
 void xe_display_driver_set_hooks(struct drm_driver *driver)
 {
-       if (!xe_modparam.enable_display)
+       if (!xe_modparam.probe_display)
                return;
 
        driver->driver_features |= DRIVER_MODESET | DRIVER_ATOMIC;
@@ -103,7 +103,7 @@ static void xe_display_fini_nommio(struct drm_device *dev, void *dummy)
 {
        struct xe_device *xe = to_xe_device(dev);
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_power_domains_cleanup(xe);
@@ -111,7 +111,7 @@ static void xe_display_fini_nommio(struct drm_device *dev, void *dummy)
 
 int xe_display_init_nommio(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return 0;
 
        /* Fake uncore lock */
@@ -127,7 +127,7 @@ static void xe_display_fini_noirq(void *arg)
 {
        struct xe_device *xe = arg;
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_display_driver_remove_noirq(xe);
@@ -137,7 +137,7 @@ int xe_display_init_noirq(struct xe_device *xe)
 {
        int err;
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return 0;
 
        intel_display_driver_early_probe(xe);
@@ -166,7 +166,7 @@ static void xe_display_fini_noaccel(void *arg)
 {
        struct xe_device *xe = arg;
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_display_driver_remove_nogem(xe);
@@ -176,7 +176,7 @@ int xe_display_init_noaccel(struct xe_device *xe)
 {
        int err;
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return 0;
 
        err = intel_display_driver_probe_nogem(xe);
@@ -188,7 +188,7 @@ int xe_display_init_noaccel(struct xe_device *xe)
 
 int xe_display_init(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return 0;
 
        return intel_display_driver_probe(xe);
@@ -196,7 +196,7 @@ int xe_display_init(struct xe_device *xe)
 
 void xe_display_fini(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_hpd_poll_fini(xe);
@@ -207,7 +207,7 @@ void xe_display_fini(struct xe_device *xe)
 
 void xe_display_register(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_display_driver_register(xe);
@@ -217,7 +217,7 @@ void xe_display_register(struct xe_device *xe)
 
 void xe_display_unregister(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_unregister_dsm_handler();
@@ -227,7 +227,7 @@ void xe_display_unregister(struct xe_device *xe)
 
 void xe_display_driver_remove(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_display_driver_remove(xe);
@@ -237,7 +237,7 @@ void xe_display_driver_remove(struct xe_device *xe)
 
 void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        if (master_ctl & DISPLAY_IRQ)
@@ -246,7 +246,7 @@ void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl)
 
 void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        if (gu_misc_iir & GU_MISC_GSE)
@@ -255,7 +255,7 @@ void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir)
 
 void xe_display_irq_reset(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        gen11_display_irq_reset(xe);
@@ -263,7 +263,7 @@ void xe_display_irq_reset(struct xe_device *xe)
 
 void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        if (gt->info.id == XE_GT0)
@@ -297,7 +297,7 @@ static bool suspend_to_idle(void)
 void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
 {
        bool s2idle = suspend_to_idle();
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        /*
@@ -327,7 +327,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
 void xe_display_pm_suspend_late(struct xe_device *xe)
 {
        bool s2idle = suspend_to_idle();
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_power_domains_suspend(xe, s2idle);
@@ -337,7 +337,7 @@ void xe_display_pm_suspend_late(struct xe_device *xe)
 
 void xe_display_pm_resume_early(struct xe_device *xe)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_display_power_resume_early(xe);
@@ -347,7 +347,7 @@ void xe_display_pm_resume_early(struct xe_device *xe)
 
 void xe_display_pm_resume(struct xe_device *xe, bool runtime)
 {
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                return;
 
        intel_dmc_resume(xe);
@@ -385,7 +385,7 @@ int xe_display_probe(struct xe_device *xe)
 {
        int err;
 
-       if (!xe->info.enable_display)
+       if (!xe->info.probe_display)
                goto no_display;
 
        intel_display_device_probe(xe);
@@ -398,7 +398,7 @@ int xe_display_probe(struct xe_device *xe)
                return 0;
 
 no_display:
-       xe->info.enable_display = false;
+       xe->info.probe_display = false;
        unset_display_features(xe);
        return 0;
 }

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 1aba6f9eaa192b75220283b1cf67431011360708..2063283871503ed9fc71e6f30ed7f039179ddf40 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -543,7 +543,7 @@ static void update_device_info(struct xe_device *xe)
 {
        /* disable features that are not available/applicable to VFs */
        if (IS_SRIOV_VF(xe)) {
-               xe->info.enable_display = 0;
+               xe->info.probe_display = 0;
                xe->info.has_heci_gscfi = 0;
                xe->info.skip_guc_pc = 1;
                xe->info.skip_pcode = 1;

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 5b7292a9a66dc93c0d60e62a025d76aa67cad3b4..16a24eadd94bdff9cdf2a6a5d252e46c57f6d3d8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -282,8 +282,15 @@ struct xe_device {
                u8 has_sriov:1;
                /** @info.has_usm: Device has unified shared memory support */
                u8 has_usm:1;
-               /** @info.enable_display: display enabled */
-               u8 enable_display:1;
+               /**
+                * @info.probe_display: Probe display hardware.  If set to
+                * false, the driver will behave as if there is no display
+                * hardware present and will not try to read/write to it in any
+                * way.  The display hardware, if it exists, will not be
+                * exposed to userspace and will be left untouched in whatever
+                * state the firmware or bootloader left it in.
+                */
+               u8 probe_display:1;
                /** @info.skip_mtcfg: skip Multi-Tile configuration from MTCFG register */
                u8 skip_mtcfg:1;
                /** @info.skip_pcode: skip access to PCODE uC */

diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c
index 499540add465a459db44840b115ff36334c31459..e7e4b1ebab505ec011661aa4bc4b34f7ad5aa2a6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_module.c
+++ b/drivers/gpu/drm/xe/xe_module.c
@@ -15,7 +15,7 @@
 #include "xe_sched_job.h"
 
 struct xe_modparam xe_modparam = {
-       .enable_display = true,
+       .probe_display = true,
        .guc_log_level = 5,
        .force_probe = CONFIG_DRM_XE_FORCE_PROBE,
        .wedged_mode = 1,
@@ -25,8 +25,8 @@ struct xe_modparam xe_modparam = {
 module_param_named_unsafe(force_execlist, xe_modparam.force_execlist, bool, 0444);
 MODULE_PARM_DESC(force_execlist, "Force Execlist submission");
 
-module_param_named(enable_display, xe_modparam.enable_display, bool, 0444);
-MODULE_PARM_DESC(enable_display, "Enable display");
+module_param_named(probe_display, xe_modparam.probe_display, bool, 0444);
+MODULE_PARM_DESC(probe_display, "Probe display HW, otherwise it's left untouched (default: true)");
 
 module_param_named(vram_bar_size, xe_modparam.force_vram_bar_size, uint, 0600);
 MODULE_PARM_DESC(vram_bar_size, "Set the vram bar size(in MiB)");

diff --git a/drivers/gpu/drm/xe/xe_module.h b/drivers/gpu/drm/xe/xe_module.h
index 61a0d28a28c8f84d118db72789d3fe446f2dfccf..161a5e6f717fbcdde82536286defe75d3b65b226 100644 (file)
--- a/drivers/gpu/drm/xe/xe_module.h
+++ b/drivers/gpu/drm/xe/xe_module.h
@@ -11,7 +11,7 @@
 /* Module modprobe variables */
 struct xe_modparam {
        bool force_execlist;
-       bool enable_display;
+       bool probe_display;
        u32 force_vram_bar_size;
        int guc_log_level;
        char *guc_firmware_path;

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index bc575bbee42d82e94648cc5439439e36858044dd..0f66cf067e2a2712395c08314c3d08125792a63f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -616,9 +616,9 @@ static int xe_info_init_early(struct xe_device *xe,
        xe->info.skip_mtcfg = desc->skip_mtcfg;
        xe->info.skip_pcode = desc->skip_pcode;
 
-       xe->info.enable_display = IS_ENABLED(CONFIG_DRM_XE_DISPLAY) &&
-                                 xe_modparam.enable_display &&
-                                 desc->has_display;
+       xe->info.probe_display = IS_ENABLED(CONFIG_DRM_XE_DISPLAY) &&
+                                xe_modparam.probe_display &&
+                                desc->has_display;
 
        err = xe_tile_init_early(xe_device_get_root_tile(xe), xe, 0);
        if (err)
@@ -829,7 +829,7 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                xe->info.media_name,
                xe->info.media_verx100 / 100,
                xe->info.media_verx100 % 100,
-               str_yes_no(xe->info.enable_display),
+               str_yes_no(xe->info.probe_display),
                xe->info.dma_mask_size, xe->info.tile_count,
                xe->info.has_heci_gscfi, xe->info.has_heci_cscfi);