Commit c8dc1546 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

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

drivers/gpu/drm/xe/xe_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/xe/xe_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/xe/xe_device.h

+1 −6
Original line number Diff line number Diff line
@@ -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__) \

drivers/gpu/drm/xe/xe_device_types.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/xe/xe_module.c

+3 −3
Original line number Diff line number Diff line
@@ -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);