drm/xe: Invert guc vs execlists parameters and info.

The module parameter should reflect the name of the optional,
experimental and unsafe option, rather than the default one.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
index 047341d5689abfe32e44d3a836ef82395efd2f76..491506a1e12e531ff9ad43381016e60095ea5b86 100644 (file)
--- a/drivers/gpu/drm/xe/xe_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_debugfs.c
@@ -47,7 +47,7 @@ static int info(struct seq_file *m, void *data)
        drm_printf(&p, "revid %d\n", xe->info.revid);
        drm_printf(&p, "tile_count %d\n", xe->info.tile_count);
        drm_printf(&p, "vm_max_level %d\n", xe->info.vm_max_level);
-       drm_printf(&p, "enable_guc %s\n", str_yes_no(xe->info.enable_guc));
+       drm_printf(&p, "force_execlist %s\n", str_yes_no(xe->info.force_execlist));
        drm_printf(&p, "supports_usm %s\n", str_yes_no(xe->info.supports_usm));
        drm_printf(&p, "has_flat_ccs %s\n", str_yes_no(xe->info.has_flat_ccs));
        for_each_gt(gt, xe, id) {

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index f948a358f53e5ed94f56665c39483aa891ba3241..63ed59c61c840476e135f8210c571f77e00333a9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -197,7 +197,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
 
        xe->info.devid = pdev->device;
        xe->info.revid = pdev->revision;
-       xe->info.enable_guc = enable_guc;
+       xe->info.force_execlist = force_execlist;
 
        spin_lock_init(&xe->irq.lock);
 

diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
index 593accb68281f3814d3ef0ff58758e69a46a056b..61a5cf1f73006489e12c37f923ba31808cc0136a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@ -116,12 +116,7 @@ static inline struct xe_gt *xe_root_mmio_gt(struct xe_device *xe)
 
 static inline bool xe_device_guc_submission_enabled(struct xe_device *xe)
 {
-       return xe->info.enable_guc;
-}
-
-static inline void xe_device_guc_submission_disable(struct xe_device *xe)
-{
-       xe->info.enable_guc = false;
+       return !xe->info.force_execlist;
 }
 
 #define for_each_tile(tile__, xe__, id__) \

diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 52c5f7ded7ce6d7922fd141cea5aa1188ebaf887..c521ffaf387196d1c71e3f6647fc1f3280a31d29 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -210,8 +210,8 @@ struct xe_device {
                u8 supports_usm:1;
                /** @has_asid: Has address space ID */
                u8 has_asid:1;
-               /** @enable_guc: GuC submission enabled */
-               u8 enable_guc:1;
+               /** @force_execlist: Forced execlist submission */
+               u8 force_execlist:1;
                /** @has_flat_ccs: Whether flat CCS metadata is used */
                u8 has_flat_ccs:1;
                /** @has_4tile: Whether tile-4 tiling is supported */

diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c
index 496a9001dc3e23472cf4850cb9bbcc9466c771d1..ed3772a6976286f355e84051d8efb184511b8ad6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_module.c
+++ b/drivers/gpu/drm/xe/xe_module.c
@@ -14,9 +14,9 @@
 #include "xe_pci.h"
 #include "xe_sched_job.h"
 
-bool enable_guc = true;
-module_param_named_unsafe(enable_guc, enable_guc, bool, 0444);
-MODULE_PARM_DESC(enable_guc, "Enable GuC submission");
+bool force_execlist = false;
+module_param_named_unsafe(force_execlist, force_execlist, bool, 0444);
+MODULE_PARM_DESC(force_execlist, "Force Execlist submission");
 
 u32 xe_force_vram_bar_size;
 module_param_named(vram_bar_size, xe_force_vram_bar_size, uint, 0600);

diff --git a/drivers/gpu/drm/xe/xe_module.h b/drivers/gpu/drm/xe/xe_module.h
index 7169907c3365ddbb578f90a1fa3a08cabd7374ed..2c1f9199f909eaad8f3ca3a5040732a2add41bd3 100644 (file)
--- a/drivers/gpu/drm/xe/xe_module.h
+++ b/drivers/gpu/drm/xe/xe_module.h
@@ -6,7 +6,7 @@
 #include <linux/types.h>
 
 /* Module modprobe variables */
-extern bool enable_guc;
+extern bool force_execlist;
 extern bool enable_display;
 extern u32 xe_force_vram_bar_size;
 extern int xe_guc_log_level;