Commit 72e8d73b authored by Francois Dugast's avatar Francois Dugast Committed by Rodrigo Vivi
Browse files

drm/xe: Cleanup style warnings and errors 



Fix 6 errors and 20 warnings reported by checkpatch.pl.

Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent ea82d5aa

drivers/gpu/drm/xe/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -1831,7 +1831,7 @@ int xe_bo_lock(struct xe_bo *bo, struct ww_acquire_ctx *ww, 
	XE_BUG_ON(!ww);



	tv_bo.num_shared = num_resv;

	tv_bo.bo = &bo->ttm;;

	tv_bo.bo = &bo->ttm;

	list_add_tail(&tv_bo.head, &objs);



	return ttm_eu_reserve_buffers(ww, &objs, intr, &dups);

drivers/gpu/drm/xe/xe_gt_mcr.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void init_steering_inst0(struct xe_gt *gt) 


static const struct {

	const char *name;

	void (*init)(struct xe_gt *);

	void (*init)(struct xe_gt *gt);

} xe_steering_types[] = {

	[L3BANK] =	{ "L3BANK",	init_steering_l3bank },

	[MSLICE] =	{ "MSLICE",	init_steering_mslice },

drivers/gpu/drm/xe/xe_gt_sysfs.c

+1 −3
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ void xe_gt_sysfs_init(struct xe_gt *gt) 
	int err;



	kg = kzalloc(sizeof(*kg), GFP_KERNEL);

	if (!kg) {

		drm_warn(&xe->drm, "Allocating kobject failed.\n");

	if (!kg)

		return;

	}



	kobject_init(&kg->base, &xe_gt_sysfs_kobj_type);

	kg->gt = gt;

drivers/gpu/drm/xe/xe_guc.c

+6 −8
Original line number Diff line number Diff line
@@ -396,9 +396,7 @@ static int guc_wait_ucode(struct xe_guc *guc) 
		struct drm_printer p = drm_info_printer(drm->dev);



		drm_info(drm, "GuC load failed: status = 0x%08X\n", status);

		drm_info(drm, "GuC load failed: status: Reset = %d, "

			"BootROM = 0x%02X, UKernel = 0x%02X, "

			"MIA = 0x%02X, Auth = 0x%02X\n",

		drm_info(drm, "GuC load failed: status: Reset = %d, BootROM = 0x%02X, UKernel = 0x%02X, MIA = 0x%02X, Auth = 0x%02X\n",

			 REG_FIELD_GET(GS_MIA_IN_RESET, status),

			 REG_FIELD_GET(GS_BOOTROM_MASK, status),

			 REG_FIELD_GET(GS_UKERNEL_MASK, status),

drivers/gpu/drm/xe/xe_hw_engine_types.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct xe_hw_engine { 
	/** @fence_irq: fence IRQ to run when a hw engine IRQ is received */

	struct xe_hw_fence_irq *fence_irq;

	/** @irq_handler: IRQ handler to run when hw engine IRQ is received */

	void (*irq_handler)(struct xe_hw_engine *, u16);

	void (*irq_handler)(struct xe_hw_engine *hwe, u16 intr_vec);

	/** @engine_id: id  for this hw engine */

	enum xe_hw_engine_id engine_id;

};