Commit c8dc1546 authored by Rodrigo Vivi's avatar Rodrigo Vivi

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent c856cc13
...@@ -47,7 +47,7 @@ static int info(struct seq_file *m, void *data) ...@@ -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, "revid %d\n", xe->info.revid);
drm_printf(&p, "tile_count %d\n", xe->info.tile_count); 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, "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, "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)); drm_printf(&p, "has_flat_ccs %s\n", str_yes_no(xe->info.has_flat_ccs));
for_each_gt(gt, xe, id) { for_each_gt(gt, xe, id) {
......
...@@ -197,7 +197,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev, ...@@ -197,7 +197,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
xe->info.devid = pdev->device; xe->info.devid = pdev->device;
xe->info.revid = pdev->revision; xe->info.revid = pdev->revision;
xe->info.enable_guc = enable_guc; xe->info.force_execlist = force_execlist;
spin_lock_init(&xe->irq.lock); spin_lock_init(&xe->irq.lock);
......
...@@ -116,12 +116,7 @@ static inline struct xe_gt *xe_root_mmio_gt(struct xe_device *xe) ...@@ -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) static inline bool xe_device_guc_submission_enabled(struct xe_device *xe)
{ {
return xe->info.enable_guc; return !xe->info.force_execlist;
}
static inline void xe_device_guc_submission_disable(struct xe_device *xe)
{
xe->info.enable_guc = false;
} }
#define for_each_tile(tile__, xe__, id__) \ #define for_each_tile(tile__, xe__, id__) \
......
...@@ -210,8 +210,8 @@ struct xe_device { ...@@ -210,8 +210,8 @@ struct xe_device {
u8 supports_usm:1; u8 supports_usm:1;
/** @has_asid: Has address space ID */ /** @has_asid: Has address space ID */
u8 has_asid:1; u8 has_asid:1;
/** @enable_guc: GuC submission enabled */ /** @force_execlist: Forced execlist submission */
u8 enable_guc:1; u8 force_execlist:1;
/** @has_flat_ccs: Whether flat CCS metadata is used */ /** @has_flat_ccs: Whether flat CCS metadata is used */
u8 has_flat_ccs:1; u8 has_flat_ccs:1;
/** @has_4tile: Whether tile-4 tiling is supported */ /** @has_4tile: Whether tile-4 tiling is supported */
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "xe_pci.h" #include "xe_pci.h"
#include "xe_sched_job.h" #include "xe_sched_job.h"
bool enable_guc = true; bool force_execlist = false;
module_param_named_unsafe(enable_guc, enable_guc, bool, 0444); module_param_named_unsafe(force_execlist, force_execlist, bool, 0444);
MODULE_PARM_DESC(enable_guc, "Enable GuC submission"); MODULE_PARM_DESC(force_execlist, "Force Execlist submission");
u32 xe_force_vram_bar_size; u32 xe_force_vram_bar_size;
module_param_named(vram_bar_size, xe_force_vram_bar_size, uint, 0600); module_param_named(vram_bar_size, xe_force_vram_bar_size, uint, 0600);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/types.h> #include <linux/types.h>
/* Module modprobe variables */ /* Module modprobe variables */
extern bool enable_guc; extern bool force_execlist;
extern bool enable_display; extern bool enable_display;
extern u32 xe_force_vram_bar_size; extern u32 xe_force_vram_bar_size;
extern int xe_guc_log_level; extern int xe_guc_log_level;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment