[Intel-xe] [PATCH 2/3] drm/xe: Invert guc vs execlists parameters and info.

[Souza, Jose]

On Fri, 2023-07-21 at 16:19 -0400, Rodrigo Vivi wrote:
> The module parameter should reflect the name of the optional,
> experimental and unsafe option, rather than the default one.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_debugfs.c      | 2 +-
>  drivers/gpu/drm/xe/xe_device.c       | 2 +-
>  drivers/gpu/drm/xe/xe_device.h       | 7 +------
>  drivers/gpu/drm/xe/xe_device_types.h | 4 ++--
>  drivers/gpu/drm/xe/xe_module.c       | 6 +++---
>  drivers/gpu/drm/xe/xe_module.h       | 2 +-
>  6 files changed, 9 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index 047341d5689a..491506a1e12e 100644
> --- 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 1c57944014e0..7221806c1693 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -203,7 +203,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 8b085ffdc5f8..0ee44856ad08 100644
> --- a/drivers/gpu/drm/xe/xe_device.h
> +++ b/drivers/gpu/drm/xe/xe_device.h
> @@ -112,12 +112,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 0cb6b0d5bf9a..b156f69d7320 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -217,8 +217,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 75e5be939f53..de85494e2280 100644
> --- 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");
>  
>  bool enable_display = true;
>  module_param_named(enable_display, enable_display, bool, 0444);
> diff --git a/drivers/gpu/drm/xe/xe_module.h b/drivers/gpu/drm/xe/xe_module.h
> index 7169907c3365..2c1f9199f909 100644
> --- 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;