Commit d6dab901 authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Lucas De Marchi
Browse files

drm/xe: Remove sysfs only once on action add failure 



The drmm_add_action_or_reset function automatically invokes the action
(sysfs removal) in the event of a failure; therefore, there's no
necessity to call it within the return check.

Modify the return type of xe_gt_ccs_mode_sysfs_init to int, allowing the
caller to pass errors up the call chain. Should sysfs creation or
drmm_add_action_or_reset fail, error propagation will prompt a driver
load abort.

-v2
Edit commit message (Nikula/Lucas)
use err_force_wake label instead of new. (Lucas)
Avoid unnecessary warn/error messages. (Lucas)

Fixes: f3bc5bb4 ("drm/xe: Allow userspace to configure CCS mode")
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240412181211.1155732-3-himal.prasad.ghimiray@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit a99641e3)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent ed30a4a5

drivers/gpu/drm/xe/xe_gt.c

+3 −1
Original line number Diff line number Diff line
@@ -378,7 +378,9 @@ static int gt_fw_domain_init(struct xe_gt *gt) 
			 err);



	/* Initialize CCS mode sysfs after early initialization of HW engines */

	xe_gt_ccs_mode_sysfs_init(gt);

	err = xe_gt_ccs_mode_sysfs_init(gt);

	if (err)

		goto err_force_wake;



	/*

	 * Stash hardware-reported version.  Since this register does not exist

drivers/gpu/drm/xe/xe_gt_ccs_mode.c

+7 −12
Original line number Diff line number Diff line
@@ -167,25 +167,20 @@ static void xe_gt_ccs_mode_sysfs_fini(struct drm_device *drm, void *arg) 
 * and it is expected that there are no open drm clients while doing so.

 * The number of available compute slices is exposed to user through a per-gt

 * 'num_cslices' sysfs interface.

 *

 * Returns: Returns error value for failure and 0 for success.

 */

void xe_gt_ccs_mode_sysfs_init(struct xe_gt *gt)

int xe_gt_ccs_mode_sysfs_init(struct xe_gt *gt)

{

	struct xe_device *xe = gt_to_xe(gt);

	int err;



	if (!xe_gt_ccs_mode_enabled(gt))

		return;

		return 0;



	err = sysfs_create_files(gt->sysfs, gt_ccs_mode_attrs);

	if (err) {

		drm_warn(&xe->drm, "Sysfs creation for ccs_mode failed err: %d\n", err);

		return;

	}

	if (err)

		return err;



	err = drmm_add_action_or_reset(&xe->drm, xe_gt_ccs_mode_sysfs_fini, gt);

	if (err) {

		sysfs_remove_files(gt->sysfs, gt_ccs_mode_attrs);

		drm_warn(&xe->drm, "%s: drmm_add_action_or_reset failed, err: %d\n",

			 __func__, err);

	}

	return drmm_add_action_or_reset(&xe->drm, xe_gt_ccs_mode_sysfs_fini, gt);

}

drivers/gpu/drm/xe/xe_gt_ccs_mode.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "xe_platform_types.h"



void xe_gt_apply_ccs_mode(struct xe_gt *gt);

void xe_gt_ccs_mode_sysfs_init(struct xe_gt *gt);

int xe_gt_ccs_mode_sysfs_init(struct xe_gt *gt);



static inline bool xe_gt_ccs_mode_enabled(const struct xe_gt *gt)

{