Unverified Commit 13636729 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe: Introduce xe_ggtt_print_holes 



Introduce a new xe_ggtt_print_holes helper that attends the SRIOV
demand and finishes the goal of limiting drm_mm access to xe_ggtt.

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240821193842.352557-9-rodrigo.vivi@intel.com


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

drivers/gpu/drm/xe/xe_ggtt.c

+40 −0
Original line number Diff line number Diff line
@@ -682,3 +682,43 @@ int xe_ggtt_dump(struct xe_ggtt *ggtt, struct drm_printer *p) 
	mutex_unlock(&ggtt->lock);

	return err;

}



/**

 * xe_ggtt_print_holes - Print holes

 * @ggtt: the &xe_ggtt to be inspected

 * @alignment: min alignment

 * @p: the &drm_printer

 *

 * Print GGTT ranges that are available and return total size available.

 *

 * Return: Total available size.

 */

u64 xe_ggtt_print_holes(struct xe_ggtt *ggtt, u64 alignment, struct drm_printer *p)

{

	const struct drm_mm *mm = &ggtt->mm;

	const struct drm_mm_node *entry;

	u64 hole_min_start = xe_wopcm_size(tile_to_xe(ggtt->tile));

	u64 hole_start, hole_end, hole_size;

	u64 total;

	char buf[10];



	mutex_lock(&ggtt->lock);



	drm_mm_for_each_hole(entry, mm, hole_start, hole_end) {

		hole_start = max(hole_start, hole_min_start);

		hole_start = ALIGN(hole_start, alignment);

		hole_end = ALIGN_DOWN(hole_end, alignment);

		if (hole_start >= hole_end)

			continue;

		hole_size = hole_end - hole_start;

		total += hole_size;



		string_get_size(hole_size, 1, STRING_UNITS_2, buf, sizeof(buf));

		drm_printf(p, "range:\t%#llx-%#llx\t(%s)\n",

			   hole_start, hole_end - 1, buf);

	}



	mutex_unlock(&ggtt->lock);



	return total;

}

drivers/gpu/drm/xe/xe_ggtt.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void xe_ggtt_remove_bo(struct xe_ggtt *ggtt, struct xe_bo *bo); 
u64 xe_ggtt_largest_hole(struct xe_ggtt *ggtt, u64 alignment, u64 *spare);



int xe_ggtt_dump(struct xe_ggtt *ggtt, struct drm_printer *p);

u64 xe_ggtt_print_holes(struct xe_ggtt *ggtt, u64 alignment, struct drm_printer *p);



#ifdef CONFIG_PCI_IOV

void xe_ggtt_assign(struct xe_ggtt *ggtt, const struct xe_ggtt_node *node, u16 vfid);

drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c

+1 −24
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
#include <linux/string_choices.h>

#include <linux/wordpart.h>



/* FIXME: remove this after encapsulating all drm_mm_node access into xe_ggtt */

#include <drm/drm_mm.h>



#include "abi/guc_actions_sriov_abi.h"

#include "abi/guc_klvs_abi.h"
@@ -2103,11 +2100,7 @@ int xe_gt_sriov_pf_config_print_dbs(struct xe_gt *gt, struct drm_printer *p) 
int xe_gt_sriov_pf_config_print_available_ggtt(struct xe_gt *gt, struct drm_printer *p)

{

	struct xe_ggtt *ggtt = gt_to_tile(gt)->mem.ggtt;

	const struct drm_mm *mm = &ggtt->mm;

	const struct drm_mm_node *entry;

	u64 alignment = pf_get_ggtt_alignment(gt);

	u64 hole_min_start = xe_wopcm_size(gt_to_xe(gt));

	u64 hole_start, hole_end, hole_size;

	u64 spare, avail, total = 0;

	char buf[10];
@@ -2116,24 +2109,8 @@ int xe_gt_sriov_pf_config_print_available_ggtt(struct xe_gt *gt, struct drm_prin 
	mutex_lock(xe_gt_sriov_pf_master_mutex(gt));



	spare = pf_get_spare_ggtt(gt);

	total = xe_ggtt_print_holes(ggtt, alignment, p);



	mutex_lock(&ggtt->lock);



	drm_mm_for_each_hole(entry, mm, hole_start, hole_end) {

		hole_start = max(hole_start, hole_min_start);

		hole_start = ALIGN(hole_start, alignment);

		hole_end = ALIGN_DOWN(hole_end, alignment);

		if (hole_start >= hole_end)

			continue;

		hole_size = hole_end - hole_start;

		total += hole_size;



		string_get_size(hole_size, 1, STRING_UNITS_2, buf, sizeof(buf));

		drm_printf(p, "range:\t%#llx-%#llx\t(%s)\n",

			   hole_start, hole_end - 1, buf);

	}



	mutex_unlock(&ggtt->lock);

	mutex_unlock(xe_gt_sriov_pf_master_mutex(gt));



	string_get_size(total, 1, STRING_UNITS_2, buf, sizeof(buf));