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

drm/xe: call free_gsc_pkt only once on action add failure 



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

-v2
Fix commit message. (Lucas)

Fixes: d8b15713 ("drm/xe/huc: HuC authentication via GSC")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240412181211.1155732-4-himal.prasad.ghimiray@intel.com


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

drivers/gpu/drm/xe/xe_huc.c

+1 −8
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc) 
	struct xe_gt *gt = huc_to_gt(huc);

	struct xe_device *xe = gt_to_xe(gt);

	struct xe_bo *bo;

	int err;



	/* we use a single object for both input and output */

	bo = xe_bo_create_pin_map(xe, gt_to_tile(gt), NULL,
@@ -66,13 +65,7 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc) 


	huc->gsc_pkt = bo;



	err = drmm_add_action_or_reset(&xe->drm, free_gsc_pkt, huc);

	if (err) {

		free_gsc_pkt(&xe->drm, huc);

		return err;

	}



	return 0;

	return drmm_add_action_or_reset(&xe->drm, free_gsc_pkt, huc);

}



int xe_huc_init(struct xe_huc *huc)