Unverified Commit c7208416 authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Rodrigo Vivi
Browse files

drm/xe: Fix NPD in ggtt_node_remove() 



Make sure that ggtt_node_remove() is invoked only if both node and ggtt
are not null. Move the null checks to the caller function
xe_ggtt_node_remove().

v2: Move null check below declarations (Tejas)

Fixes: 919bb54e ("drm/xe: Fix missing runtime outer protection for ggtt_remove_node")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Tejas Upadhyay <tejas.upadhyay@intel.com>
Reviewed-by: default avatarTejas Upadhyay <tejas.upadhyay@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240828092229.3606503-1-himal.prasad.ghimiray@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 379cad69

drivers/gpu/drm/xe/xe_ggtt.c

+8 −5
Original line number Diff line number Diff line
@@ -286,9 +286,6 @@ static void ggtt_node_remove(struct xe_ggtt_node *node) 
	bool bound;

	int idx;



	if (!node || !node->ggtt)

		return;



	bound = drm_dev_enter(&xe->drm, &idx);



	mutex_lock(&ggtt->lock);
@@ -328,8 +325,14 @@ static void ggtt_node_remove_work_func(struct work_struct *work) 
 */

void xe_ggtt_node_remove(struct xe_ggtt_node *node, bool invalidate)

{

	struct xe_ggtt *ggtt = node->ggtt;

	struct xe_device *xe = tile_to_xe(ggtt->tile);

	struct xe_ggtt *ggtt;

	struct xe_device *xe;



	if (!node || !node->ggtt)

		return;



	ggtt = node->ggtt;

	xe = tile_to_xe(ggtt->tile);



	node->invalidate_on_remove = invalidate;