Commit 72bae5c2 authored by Matthew Brost's avatar Matthew Brost Committed by Maarten Lankhorst
Browse files

drm/xe: Drop ggtt invalidate from display code 



Only buffers mapped in the GGTT used by the GuC require an invalidation.
Display buffers do not require an invalidation. Delete the invalidatio
from display code and make invalidation a static function in xe_ggtt.c.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240306052002.311196-3-matthew.brost@intel.com
parent a6eff8f9

drivers/gpu/drm/xe/display/xe_fb_pin.c

+1 −2
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ static int __xe_pin_fb_vma_ggtt(struct intel_framebuffer *fb, 
					   rot_info->plane[i].dst_stride);

	}



	xe_ggtt_invalidate(ggtt);

out_unlock:

	mutex_unlock(&ggtt->lock);

out:

drivers/gpu/drm/xe/xe_ggtt.c

+3 −1
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ int xe_ggtt_init_early(struct xe_ggtt *ggtt) 
	return drmm_add_action_or_reset(&xe->drm, ggtt_fini_early, ggtt);

}



static void xe_ggtt_invalidate(struct xe_ggtt *ggtt);



static void xe_ggtt_initial_clear(struct xe_ggtt *ggtt)

{

	struct drm_mm_node *hole;
@@ -261,7 +263,7 @@ static void ggtt_invalidate_gt_tlb(struct xe_gt *gt) 
		drm_warn(&gt_to_xe(gt)->drm, "xe_gt_tlb_invalidation_ggtt error=%d", err);

}



void xe_ggtt_invalidate(struct xe_ggtt *ggtt)

static void xe_ggtt_invalidate(struct xe_ggtt *ggtt)

{

	/* Each GT in a tile has its own TLB to cache GGTT lookups */

	ggtt_invalidate_gt_tlb(ggtt->tile->primary_gt);

drivers/gpu/drm/xe/xe_ggtt.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
struct drm_printer;



void xe_ggtt_set_pte(struct xe_ggtt *ggtt, u64 addr, u64 pte);

void xe_ggtt_invalidate(struct xe_ggtt *ggtt);

int xe_ggtt_init_early(struct xe_ggtt *ggtt);

int xe_ggtt_init(struct xe_ggtt *ggtt);

void xe_ggtt_printk(struct xe_ggtt *ggtt, const char *prefix);