Commit 9b6483af authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Rodrigo Vivi
Browse files

drm/xe: Map initial FB at the same place in GGTT too 



I saw a flicker when booting xe, and it's very likely that the original
FB was not mapped at the same place when inheriting, fix it.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 09a68b4a

drivers/gpu/drm/xe/xe_bo.c

+6 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,12 @@ xe_bo_create_locked_range(struct xe_device *xe, 


		XE_BUG_ON(!gt);



		if (flags & XE_BO_CREATE_STOLEN_BIT &&

		    flags & XE_BO_FIXED_PLACEMENT_BIT) {

			err = xe_ggtt_insert_bo_at(gt->mem.ggtt, bo, start);

		} else {

			err = xe_ggtt_insert_bo(gt->mem.ggtt, bo);

		}

		if (err)

			goto err_unlock_put_bo;

	}

drivers/gpu/drm/xe/xe_ggtt.c

+13 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ void xe_ggtt_map_bo(struct xe_ggtt *ggtt, struct xe_bo *bo) 
	xe_ggtt_invalidate(ggtt->gt);

}



int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo)

static int __xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 start, u64 end)

{

	int err;
@@ -271,12 +271,22 @@ int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo) 
		return err;



	mutex_lock(&ggtt->lock);

	err = drm_mm_insert_node(&ggtt->mm, &bo->ggtt_node, bo->size);

	err = drm_mm_insert_node_in_range(&ggtt->mm, &bo->ggtt_node, bo->size, 0, 0, start, end, 0);

	if (!err)

		xe_ggtt_map_bo(ggtt, bo);

	mutex_unlock(&ggtt->lock);



	return 0;

	return err;

}



int xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 ofs)

{

	return __xe_ggtt_insert_bo_at(ggtt, bo, ofs, ofs + bo->size);

}



int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo)

{

	return __xe_ggtt_insert_bo_at(ggtt, bo, 0, U64_MAX);

}



void xe_ggtt_remove_node(struct xe_ggtt *ggtt, struct drm_mm_node *node)

drivers/gpu/drm/xe/xe_ggtt.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ int xe_ggtt_insert_special_node_locked(struct xe_ggtt *ggtt, 
void xe_ggtt_remove_node(struct xe_ggtt *ggtt, struct drm_mm_node *node);

void xe_ggtt_map_bo(struct xe_ggtt *ggtt, struct xe_bo *bo);

int xe_ggtt_insert_bo(struct xe_ggtt *ggtt, struct xe_bo *bo);

int xe_ggtt_insert_bo_at(struct xe_ggtt *ggtt, struct xe_bo *bo, u64 ofs);

void xe_ggtt_remove_bo(struct xe_ggtt *ggtt, struct xe_bo *bo);



#endif